Update to latest rustc
Update for more rustc changes
Merge pull request #27 from am0d/master

Update for latest rust changes