Upgrade to rust
Merge pull request #31 from larsbergstrom/rustup_20140410

Changes for Rust Upgrade