Udpate to rust master
Merge pull request #64 from alexcrichton/update

Udpate to rust master