fix
Merge branch 'develop' of github.com:ebuchman/pyethereum into develop