almost done
Merge branch 'master' of github.com:rstiller/wordpress-installation

Conflicts:
	README.md
	modules/apache2/files/template
	modules/custom/files/add-customer.sh