Upgrade pathogen and add vim-less plugin
Merge branch 'master' of github.com:robgolding63/.vim

Conflicts:
	.gitmodules