Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added password
Merge pull request #136 from tbrooke/master

deployment tweak