Updating to support new Nepho features
Adding examples of bootstrap and simple AWS, updating README
adding instance mapping
Adding Puppetfile.lock
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	README.md
	blueprints/aws-single-host.yaml
	blueprints/vagrant-single-host.yaml
	cloudlet.yaml
	payload/hooks/bootstrap
	payload/hooks/configure
	payload/puppet/Puppetfile
	payload/puppet/manifests/init.pp
	resources/vagrant-single-host/Vagrantfile
Adding Puppet role/profile pattern and Vagrant