vimrc
Merge branch 'master' of https://github.com/benekastah/dotfiles

* 'master' of https://github.com/benekastah/dotfiles:
  vimrc