updated deploy file
Merge branch 'master' of https://github.com/paul-headington/OnyxTestBuild

Conflicts:
	deploy_beanstalk.sh