Update to reflect findings for stages in travis

.travis.yml

 sudo: false
 language: python
-python:
- - 2.7
- - 3.4
- - 3.5
- - 3.6
- - pypy
- - pypy3
 env:
   global:
-   - PATH=$HOME/.local/bin:$PATH
-   - AWS_DEFAULT_REGION=us-east-1
-   - secure: "inURdx4ldkJqQXL1TyvKImC3EnL5TixC1DlNMBYi5ttygwAk+mSSSw8Yc7klB6D1m6q79xUlHRk06vbz23CsXTM4AClC5Emrk6XN2GlUKl5WI+z+A2skI59buEhLWe7e2KzhB/AVx2E3TfKa0oY7raM0UUnaOkpV1Cj+mHKPIT0="
-   - secure: "H32DV3713a6UUuEJujrG7SfUX4/5WrwQy/3DxeptC6L7YPlTYxHBdEsccTfN5z806EheIl4BdIoxoDtq7PU/tWQoG1Lp2ze60mpwrniHajhFnjk7zP6pHvkhGLr8flhSmAb6CQBreNFOHTLWBMGPfi7k1Q9Td9MHbRo/FsTxqsM="
-
-install:
- - pip install awscli
- - pip install -r requires/testing.txt
- - python setup.py develop
+  - PATH=$HOME/.local/bin:$PATH
+  - AWS_DEFAULT_REGION=us-east-1
+  - secure: "inURdx4ldkJqQXL1TyvKImC3EnL5TixC1DlNMBYi5ttygwAk+mSSSw8Yc7klB6D1m6q79xUlHRk06vbz23CsXTM4AClC5Emrk6XN2GlUKl5WI+z+A2skI59buEhLWe7e2KzhB/AVx2E3TfKa0oY7raM0UUnaOkpV1Cj+mHKPIT0="
+  - secure: "H32DV3713a6UUuEJujrG7SfUX4/5WrwQy/3DxeptC6L7YPlTYxHBdEsccTfN5z806EheIl4BdIoxoDtq7PU/tWQoG1Lp2ze60mpwrniHajhFnjk7zP6pHvkhGLr8flhSmAb6CQBreNFOHTLWBMGPfi7k1Q9Td9MHbRo/FsTxqsM="
 stages:
- - test
- - name: upload_coverage
-   if: branch = master
- - name: deploy
-   if: tag IS present
+- test
+- name: upload coverage
+- name: deploy
+  if: tag IS present
+
+services:
+- postgres
+
+install:
+- pip install awscli
+- pip install -r requires/testing.txt
+- python setup.py develop
 script: nosetests
@@ -34,11 +29,14 @@ after_success:
 jobs:
   include:
-   - stage: test
-     services:
-     - postgres
-     script: nosetests
+   - python: 2.7
+   - python: 3.4
+   - python: 3.5
+   - python: 3.6
+   - python: pypy
+   - python: pypy3
    - stage: upload coverage
+     services: []
      python: 3.6
      install:
      - pip install awscli coverage codecov
@@ -54,6 +52,10 @@ jobs:
      after_success: codecov
    - stage: deploy
      python: 3.6
+     services: []
+     install: true
+     script: true
+     after_success: true
      deploy:
        distributions: sdist bdist_wheel
        provider: pypi