Revert "Merge branch 'master' into develop"

ethantkoenig · ethantkoenig · commit 923ee6328e5e · 2016-09-06T22:30:29.000-04:00
This reverts commit b869647, reversing changes made to 6b4e711.
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,10 @@ python:
 - '3.3'
 - '3.4'
 - '3.5'
+branches:
+  only:
+  - master
+  - develop
 install:
 - pip install -r requirements.txt
 - pip install -r test_requirements.txt
