Update to master
Merge pull request #45 from alexcrichton/cargo

Update to master