minor
Merge branch 'master' of https://github.com/crowbar/crowbar-utils

Conflicts:
	vagrant_crowbar/personal.json.example

Signed-off-by: Judd Maltin <judd_maltin@dell.com>