Merge pull request #249 from kjeremy/update-cargo

Update cargo and other crates