Merge branch 'master' of github.com:ethereum/pyethereum

Conflicts:
	features/hooks/config.py
	features/peermanager.feature
	features/steps/peer.py
	features/steps/peermanager.py
	pyethereum/peer.py
	pyethereum/peermanager.py
	pyethereum/signals.py