minor changes i3-config; added emacs mode
Merge branch 'master' of https://github.com/makp/x-configs