Update to work on Rust nightly

Also changed the makefile a bit.