support supervisord, not upstart
Merge branch 'berkeley' into berkeley-power