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

* 'master' of https://github.com/benoptimus/dotfiles:
  vim settings dotfiles
  initial commit,gitconfig
Merge branch 'master' of https://github.com/benoptimus/dotfiles

* 'master' of https://github.com/benoptimus/dotfiles:
  vim settings dotfiles
  initial commit,gitconfig