Fixed my git whitespace settings
Merge branch 'master' of https://github.com/benjackson/dotfiles

* 'master' of https://github.com/benjackson/dotfiles:
  Fixed my git whitespace settings