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

Update to rust master