Vagrant and puppet nginx box for use during the build
Merge branch 'release/0.1'