Rust upgrade
Merge pull request #8 from larsbergstrom/rust_20140224_squashed

Rust upgrade