Update to rust master
Merge pull request #65 from alexcrichton/update

Update to rust master