vim textwidth
Merge branch 'master' of github.com:russelldavies/dotfiles

* 'master' of github.com:russelldavies/dotfiles:
  Update to gitconfig
  OS X specific changes