Update to compile with rust master at 4bc7672

Lots of memory corruption when running tests though, so you probably don't want to merge this until I get those sorted out.