updated emacs config
updated emacs config
Merge branch 'master' of github.com:Tritlo/dotfiles

* 'master' of github.com:Tritlo/dotfiles:
  updated vimrc, now uses vimplug