Fixes to run and test on nightly

Builds and tests successfully on `rustc 0.13.0-nightly (2274996a1 2014-11-23 00:36:43 +0000)`