Puppet deploy to be vagrant/ec2 agnostic fixes #4