Add back ergoemacs-fixed-key and ergoemacs-key compatability.
Makefile fixes