Allow custom deployment location
Update puppet if it is already installed
Merge pull request #46 from elyezer/puppet-update

Update puppet if it is already installed
Merge pull request #47 from daviddavis/temp/20140509131846

Allow custom deployment location
Script returns non-zero on errors