Update to rust master

Oh, whoops, I must have missed that when pulling it in. This is fine for now, I'll clean it up later.