Update to be similar to master.

Revert "Transaction Queue integration"

fix benches compilation

Transaction Queue integration

verifier trait improvements

build on rust stable

Geth import silent if no geth

Additional journaldb logging and assert

Uncle inclusion in block authoring.

Conflicts:
	ethcore/src/client.rs
	sync/src/tests/helpers.rs

Fixed potential deadlock on startup

Fixing an overflow panic

Fixed one more case of sync stalling

JournalDB can now operate in "archive" mode

Fixes #579

Secret store integration with client

fix build on nightly rust