Added ace-jump-mode to Emacs
Fixed conflicts