Added some grep configs to .gitconfig
Merge branch 'master' of github.com:LuRsT/Setup

Conflicts:
	.gitconfig
	.xdg/vim/bundle/python-mode
	.xdg/vim/bundle/vim-airline
	.xdg/vim/bundle/vim-fugitive