Merge branch 'master' of github.com:ethereum/pyethereum
Merge branch 'master' of github.com:ethereum/pyethereum
remove_from_known_peers function in peermanager. fix tests to use tmpdir and peers.json
Added fix for contract creation state changes
Changed memory fees to a per-32 basis, and added SLT and SGT support
Changed memory fees to a per-32 basis, and added SLT and SGT support
report values before failing
Merge branch 'ebuchman-master'