Merge from EC2 testing.
Merge branch 'dev' of github.com:browndav/vm-toaster into dev

Conflicts:
	scripts/launch-ec2-build