Update to rust-master; all tests pass

All tests are now passing.  Note that there are still some warnings from rustc when building, though.

Should now fix the failing tests with the new master.