Merge pull request #557 from chadlung/master

Remove line from build.py that is never used
Change Meniscus to use Upstart instead of init.d