Forward-port to Rust nightly (as of 13/07/2014).
Remove erroneously committed local path name from Makefile and re-add fixup invocation.