remove vestigal supervisorconf
change default supervisorconf to include olap, etc
Merge pull request #1027 from oostendo/develop

remove broker from supervisor.conf, add olap