Merge pull request #216 from ethereum/develop

_data/chain1

_data/chain2

block_pool.go

cmd/ethereum/flags.go

cmd/ethereum/main.go

cmd/evm/main.go

cmd/mist/assets/qml/main.qml

cmd/mist/assets/qml/views/wallet.qml

cmd/mist/bindings.go

cmd/mist/debugger.go

cmd/mist/flags.go

cmd/mist/gui.go

cmd/mist/main.go

cmd/mist/ui_lib.go

cmd/peerserver/main.go

cmd/utils/cmd.go

cmd/utils/vm_env.go

core/block_manager.go

core/chain_manager.go

core/chain_manager_test.go