Updating stable

Automerge wont work because of the "emergency edit" in `php-fpm::monit`
Removing `subversion` is like the most subtle change. I'll poke around more first before we merge this and make our lives miserable. ;)