minor vim changes
Merge branch 'master' of github.com:ivarg/dotfiles
change git config and vim settings
Merge branch 'master' of github.com:ivarg/dotfiles

* 'master' of github.com:ivarg/dotfiles:
  update emacs.d