Update setup scripts for production
Merge branch 'production' into pagespeed

Conflicts:
	vagrant/setup_apache2.sh