Use new AMI that won't cause issues with cloud-init apply_creds
Fix issue where Vagrant AWS deploys outside of my dev account would fail
Merge remote-tracking branch 'upstream/master' into vagrant11-providers

Conflicts:
	puppet/modules/docker/manifests/init.pp
Remove duplicate user definition
Fix Rackspace cloud user, remove dupe /home/vagrant definition
Stop using custom AMI and use standard Ubuntu AMI
Merge pull request #192 from chooper/vagrant11-providers

Fix AWS provisioning with Vagrant