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

Update to rust master
v0.2.5