Merge branch 'master' into docs/morris

Author: jdherman

.travis.yml

@@ -1,10 +1,9 @@
-# Travis config for SALib/SALib
 sudo: false
 language: python
 virtualenv:
   system_site_packages: true
 services:
-  - postgresql
+- postgresql
 env:
   matrix:
   - DISTRIB="conda" PYTHON_VERSION="2.7" COVERAGE="true"
@@ -24,4 +23,11 @@ after_success:
 cache:
 - apt
 notifications:
- email: false
+  email: false
+deploy:
+  provider: pypi
+  on:
+    tags: true
+  user: jdherman
+  password:
+    secure: KiUygZVHWMR2a+fk092xeHh8J2c61VGrgq4v1l3bq41MxcZO745H7CLJJ3rfqo+G5/pqy4/tm+q3p8fHhbUmwMcuSC3vjRN6WAYjuNPs0FMVXiIkMQtevv2LdVF1zVKFBdYTuNrfugtZ/GXh/ReCydjEBWTrTaNYeNM4ZRIaj0Q=