added wheezy apache2.conf
Merge branch 'master' of git://labs.riseup.net/shared-apache
added paths so wheez config is picked up, also linted a bit
Merge branch 'master' of git://labs.riseup.net/shared-apache
updated facts in file source for apache2.conf, linted
Merge commit 'dafb060'

Conflicts:
	manifests/debian.pp