Use port 80 by default
Merge branch 'listenports' into testing

Conflicts:
	templates/default/wordpress.conf.erb