Merge branch 'master' into develop

Richard Mahn · Richard Mahn · commit b869647ca2d6 · 2016-09-05T11:27:09.000-06:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,6 @@ python:
 - '3.3'
 - '3.4'
 - '3.5'
-branches:
-  only:
-  - master
-  - develop
 install:
 - pip install -r requirements.txt
 - pip install -r test_requirements.txt
