Merge branch 'master' into patch-1

.travis.yml

@@ -51,10 +51,11 @@ after_success:
       echo "Not deploying (because this is not a deployment branch)" ;
       exit 0 ;
     fi
-  - if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
+  - if ! [ $TRAVIS_PULL_REQUEST = "false" ] ; then
       echo "Not deploying (because this is a pull request)" ;
       exit 0 ;
     fi
+  - echo "Deploying"
 
   # unpack credentials
   - openssl aes-256-cbc -K $encrypted_5813a1339455_key -iv $encrypted_5813a1339455_iv -in credentials.tar.gz.enc -out credentials.tar.gz -d
@@ -63,7 +64,7 @@ after_success:
   # deploy to pypi
   - mv credentials/.pypirc ~/.pypirc ;
   - python setup.py sdist ;
-  - twine upload dist/* --skip-existing;
+  - twine upload dist/* --skip-existing ;
 
 notifications:
   slack: simpeg:1KZq5giMtlJJ58TijIPgqf7n