Merge branch 'hotfix/newmodules'
Re-enable puppet provisioning in Vagrantfile.
Merge branch 'hotfix/v0.0.4' into develop