Merge pull request #157 from ozkriff/master

Updated for latest Rust
Updated to latest Rust: ~str -> BufStr