- Consistent formatting, improved reliability
Merge branch 'master' of github.com:ksean/server-cluster

Conflicts:
	service/core/haproxy.service
	service/core/mysql.service
	service/dynamic/dyn-apache.service
	service/dynamic/dyn-mysql.service
	service/register/reg-apache.service
	service/register/reg-mysql.service