add ability to change apache listen port over default/thruk file
Merge branch 'default_config'

Conflicts:
	metadata.rb