Whitespace fixes
Naming scheme / generalizations
Upstart conf