F2
Merge branch 'master' of github.com:bflyblue/vimrc

Conflicts:
	shaun/vimrc
Merge branch 'master' of github.com:bflyblue/vimrc
fix wildignore