Update secure apache configuration in script.
Merge branch 'master' into oneiric

Conflicts:
	deploy.d/50-apache.sh