Merge pull request #1521 from obscuren/client-update

cmd/geth/main.go

core/chain_makers_test.go

core/chain_manager.go

eth/handler.go

eth/protocol.go

eth/protocol_test.go

params/protocol_params.go