config and peers file. ignore own id. set listen port after hello
Merge branch 'master' of github.com:ebuchman/pyethereum

Conflicts:
	pyethereum/peermanager.py