removing internal_modules
fix vagrant defaults bug
stop being clever
Enable ec2_* facts in VPC to fix bootstrapping

And because they are just nice to have.
Fixing ec2_vpc facts display
Merge remote-tracking branch 'upstream/master'

Conflicts:
	payload/hooks/bootstrap
	payload/hooks/configure
	payload/puppet/Puppetfile
	resources/vagrant-single-host/Vagrantfile