deployment.bash now merges master into heroku-branch