Merge pull request #31 from ozkriff/master

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