more cleanup fo imgbuilder
Merge branch 'master' of github.com:wuxxin/salt-shared

Conflicts:
	roles/imgbuilder/init.sls