Updated supervisord and container script.
Updated for HA.
Merge branch 'master' of https://github.com/clustervision/trinity

Conflicts:
	ha-xcat/Dockerfile