Tweak makefile
Fixes for latest Rust nightly
Merge pull request #1 from irh/FixesForRustNightly

Fixes for the latest Rust nightly