Merge pull request #1 from pypyr/dev

First Blood

Author: thomas

.gitignore

@@ -76,7 +76,7 @@ target/
 celerybeat-schedule
 
 # dotenv
-.env
+.env*
 
 # virtualenv
 venv/
@@ -87,3 +87,6 @@ ENV/
 
 # Rope project settings
 .ropeproject
+
+# Shippable
+shippable/