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

Update to rust master