Merge remote-tracking branch 'spf13/3.0' into 3.0

Conflicts:
	.vimrc.bundles
	bootstrap.sh
add command alias for neobundle to compatible with vundle
Merge remote-tracking branch 'origin/3.0'