Merge pull request #184 from bjz/update

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

update to master
Use a correct crate_name
Merge pull request #186 from cmr/master

update to master
Update for to_str->to_string and macro hygiene changes