changed naming on upstart script for supervisorctl behavior
asbtracted dirs into settings.sls and ensured init scripts aren't named supervisord.conf
tweak to config file location
making ids static
fix daemon name, fix file references, fix diamond state
Merge branch 'carlcrott-patch'