Whitespace
Get things working with Cargo and Rust 0.13
Merge pull request #1 from tamird/modernize

Modernize