deploy script now merges master into bin before deploying