Remove boilerplate from init.d script
Merge branch 'issue8' into secure-connections