Fix
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Conflicts:
	ethereal/ethereum.go
	ethereum/ethereum.go