Fix whitespace in allah help output
Merge branch 'master' into puppet/v1

Conflicts:
	allah