Merge wpietri's branch 'just-one-host' into 'master'
Refactor validation criteria so its a bit more understable what is going on

Conflicts:
	templates/default/services.cfg.erb