replacing --open-ssh with --shell
Merge branch 'master' of github.com:tis-innovation-park/vmm

Conflicts:
	bin/tm-vmm.tmpl