Update gitconfig
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles
Merge git://github.com/ajoslin/dotfiles