Merge changes from kballard

Updates to language changes since Rust 0.5