Update to work on Rust nightly

Also changed the makefile a bit. I'm not sure if it's the most idiomatic though. I remove those changes if you want.