Update to support the current rust master
Merge pull request #50 from dotdash/rustup

Update to support the current rust master