.gitconfig modeline, .vimrc pathogen
Merge branch 'master' of https://github.com/cieplik/config

Conflicts:
	git/.gitconfig