Upgrades for latest rust.
Merge pull request #17 from metajack/rust-up

Upgrades for latest rust.