vim textwidth added
Merge branch 'master' of https://www.github.com/hkopp/dotfiles

* 'master' of https://www.github.com/hkopp/dotfiles:
  cleaning
  merge conflict