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

Conflicts:
	templates/default/services.cfg.erb