Use vimdiff for git diffing, maybe
Merge branch 'master' of git://github.com/cmckendry/Configurations

* 'master' of git://github.com/cmckendry/Configurations:
  Don't block login process on auto-update
  Making 'git unfuck' handle submodules
Merge branch 'master' of git://github.com/cmckendry/Configurations

* 'master' of git://github.com/cmckendry/Configurations:
  Doing a test commit
Merge branch 'master' of git://github.com/cmckendry/Configurations

* 'master' of git://github.com/cmckendry/Configurations:
  Unborking terminal colors
Clean up tabs with vim
Merge branch 'master' of git://github.com/cmckendry/Configurations

* 'master' of git://github.com/cmckendry/Configurations:
  Screwing around with vim