fix template
move stuff around
Merge branch 'CFY-1153-automate_vagrant_box_creation' of github.com:cloudify-cosmo/cloudify-packager into CFY-1153-automate_vagrant_box_creation

Conflicts:
	image-builder/cloudify-quickstart/build_nightly_box.sh