Updated core.whitespace git config
Merge branch 'master' of github.com:jesseschalken/dotfiles