Log file
Default local port back to 80.
Merge branch 'master' of github.com:nbaum/envoy

Conflicts:
	lib/envoy/version.rb