Use PROJECT_DIR for Puppet root
Disable papply.sh
Merge from upstream
Use unique gemset name
Merge branch 'master' of github.com:stuartellis/vagrant_sandbox