Upgraded Vagranfile version + minor Puppet manifest improvements