update README regarding munin graphs
Merge remote-tracking branch 'shared/master' into riseup

Conflicts:
	README
Merge branch 'leap' into riseup
fix $apache::no_default_site variable
Merge branch 'master' of labs.riseup.net:module_apache into riseup
Document templatewlv requirement
enable status module on debian
fix merge conflict snafu introduced by:
115691c87bad3f5863f088e73603133b67c9f828

this fixes the incorrectly nested case statement, and brings back the
lost 'config file as link' changes
Merge branch 'riseup'