Added autojump conf, some changes in emacs inits
Changes in emacs
Fixed merge issues