added janus modifications
modified to put leaderkey in before
added emacs settings so far
fixed merge conflict