updated vimrc
Merge branch 'theprogram' of github.com:todesignandconquer/dotfiles into damir

* 'theprogram' of github.com:todesignandconquer/dotfiles:
  updated vimrc