Fix for latest Rust, and include+fix #54

One ~str needed to be changed to a StrBuf.

Also, I fixed and merged #54 into this pull request.