Add git config includes.  Requires git 2.x (I think?)
Merge branch 'master' of github.com:blovett/dotfiles
Merge branch 'master' of github.com:blovett/dotfiles