Update for latest Rust (c97f885): crate file names
Merge pull request #185 from cmr/master

update to master