added  to upstart configs
Merge branch 'master' into feature/no-dropbox-hack