As we run everything with the if, we only have to do one stage

.travis.yml

@@ -14,30 +14,20 @@ install:
   - pip freeze
 jobs:
   include:
-    - stage: prepare cache
-      script: true
-      python: 2.7.11
-    - stage: prepare cache
-      script: true
-      python: 3.5.2
-
-    - stage: Run unit tests
+    - stage: Run unit tests and deploy
       script: 
         - py.test tests/units -n 2
         - sed -i 's/\-n auto/\-n 2/g' setup.cfg
         - "if [ $TRAVIS_PULL_REQUEST == false ] && [$TRAVIS_BRANCH == 'master']; then python setup.py test; fi"
       python: 2.7.11
       after_success:
         - coveralls
-    - stage: Run unit tests
+    - stage: Run unit tests and deploy
       script:
         - py.test tests/units -n 2
         - sed -i 's/\-n auto/\-n 2/g' setup.cfg
         - "if [ $TRAVIS_PULL_REQUEST == false ] && [$TRAVIS_BRANCH == 'master']; then python setup.py test; fi"
       python: 3.5.2
-
-    - stage: Deploy to pipy
-      script: skip
       deploy:
         provider: pypi
         user: MaxChrist