Squashed commit of the following:

commit e0ef5347184ce20ec8d2ea9aff1d23f82d1b38ce
Author: Lee Hambley <lee.hambley@gmail.com>
Date:   Mon Jun 17 17:57:53 2013 +0200

    Safer stop scripts for upstart

commit b40f98a7911a15b3eb6036ac8009b3e0a78d31c4
Author: Lee Hambley <lee.hambley@gmail.com>
Date:   Mon Jun 17 17:48:36 2013 +0200

    Do this as root, for safety

commit 765365a44659282672c82e66810bd82bd581344f
Author: Lee Hambley <lee.hambley@gmail.com>
Date:   Mon Jun 17 17:44:13 2013 +0200

    Tweaks around samba/netatalk

commit 1292885a81f84250abee3c6c0967f9f8e0bfb11c
Author: Ali Jelveh <jelveh@web.de>
Date:   Mon Jun 17 15:31:33 2013 +0200

    * no init style scripts for netatalk

commit 359131623ca1d53056a2bd7f235084c144314a80
Author: Lee Hambley <lee.hambley@gmail.com>
Date:   Mon Jun 17 14:16:27 2013 +0200

    Remove policy-rc.d from apache2 deps

commit 1f49335bf557ed94c18cb1863cff31b81d64f571
Author: Ali Jelveh <jelveh@web.de>
Date:   Mon Jun 17 13:23:54 2013 +0200

    use smbpasswd instead of tdsam ...

commit 347d14488ebae6945d0f9303252c09da4fc67030
Author: Ali Jelveh <jelveh@web.de>
Date:   Fri Jun 14 14:53:12 2013 +0200

    netatalk update!

commit e0d886a1d55f6be03e75660e387d7d6f6619ba25
Author: Ali Jelveh <jelveh@web.de>
Date:   Fri Jun 14 14:51:26 2013 +0200

    * fix wrong policy writing in the apache2-dev modules - I don't think they're necessary here cc @leehambley