Use github as the bundle URL
Merge branch 'master' of https://github.com/marcoy/vimrc

Conflicts:
	vimrc