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

Conflicts:
	recipes/default.rb