Revert maxSimultaneousBlockDownloads to 20, re-enable profiling, and run go fmt
Merge remote-tracking branch 'origin/master'

Conflicts:
	peer.go