Syncing with main repo
Merge branch 'master' of https://github.com/pilf/vim-files

Conflicts:
	.vimrc
I think it's been a while :S
Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	.vimrc