[services] prefer upstart over initscripts (fixes Eugeny/ajenti-v#82)
Merge branch 'master' of github.com:Eugeny/ajenti