Cleaned up comments
Merge branch 'cleanup'
Added example ubuntu upstart config
Merge branch 'extras'