Use new import as syntax
Update for rust rfc 52 changes
Merge pull request #29 from ebfe/rust-master

Update for rust master