updating for pre2
bup version and merge branch 'master' of https://github.com/ezrapagel/knife-vsphere

Conflicts:
	CHANGELOG