Set up /dev/sdb as config drive for cloud-init so we can pass in ssh keys and don't need to hard-code them
Merge branch 'master' of https://github.com/indiebox/tools

Conflicts:
	webapptest/vendor_perl/UBOS/WebAppTest/Scaffolds/VBox.pm