#92, not finished
Merge branch 'master' of github.com:ethereum/pyethereum

Conflicts:
	pyethereum/blocks.py
	tests/test_chain.py