this PR is based on issue #102#103

shmuel-blitz wants to merge 2 commits intoeinaregilsson:mastereinaregilsson/beanstalk-deploy:masterfrom

shmuel-blitz:mastershmuel-blitz/beanstalk-deploy:masterCopy head branch name to clipboard