vimrc
Merge branch 'master' of github.com:chrislongo/vim

Conflicts:
	vimrc