Merge branch '3.0' of github.com:spf13/spf13-vim into HEAD
Various fixes
Merge commit 'baa37ec637e1d714bcd0442f69868fee3a1c85a7' into 3.0

Conflicts:
	.vimrc.fork
	bootstrap.sh
	spf13-vim-windows-install.cmd