rustup
Merge pull request #49 from bfops/master

Update for latest rustc