Update to rust-master; will now build

All tests are now passing.  Note that there are still some warnings from rustc when building, though.