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

Update to rust master