fehbg
Merge branch 'master' of github.com:rdamen/dotfiles

* 'master' of github.com:rdamen/dotfiles:
  vim
  emacs
  emacs