Make the init script bit more debian-like
Merge branch 'dev'