add upstart support
Merge branch 'upstart_support' into amalgamated_modz