Add information about encrypting passwords and keys for Travis CI
Update README.md
Merge remote-tracking branch 'upstream/master'