Leaving my gitconfig info in place.
Merge branch 'master' of https://github.com/TrevorS/dotfiles
Tracking .gitconfig normally.