Revert ethash and submodule change and remove evmbin benches.

The `ethhash` benches should be used with `--features bench`.
The submodule update broke the tests.
And the `evmbin` benches have been removed in `master`.

ethash/src/lib.rs

@@ -34,16 +34,20 @@ extern crate serde_json;
 #[cfg(test)]
 extern crate tempdir;
 
-// TODO: This should be private; only needed for benches.
+#[cfg(feature = "bench")]
 pub mod compute;
+#[cfg(not(feature = "bench"))]
+mod compute;
 
 mod seed_compute;
 mod cache;
 mod keccak;
 mod shared;
 
-// TODO: This should be private; only needed for benches.
+#[cfg(feature = "bench")]
 pub mod progpow;
+#[cfg(not(feature = "bench"))]
+mod progpow;
 
 pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};