Merge pull request #267 from frappe/master

chore: sync master and develop

.gitignore

@@ -8,3 +8,5 @@ sites
 
 development
 !development/README.md
+deploy_key
+deploy_key.pub

.travis.yml

@@ -6,6 +6,8 @@ services:
   - docker
 
 before_install:
+  - openssl aes-256-cbc -K $encrypted_189e52c2c347_key -iv $encrypted_189e52c2c347_iv
+    -in deploy_key.enc -out deploy_key -d
   - if [[ "$BUILD" != "development" ]]; then
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin;
     sudo apt-get update && sudo apt-get -y install git;