modified:   .vimrc
	modified:   .vimrc.fork
Merge branch '3.0' of https://github.com/yishanhe/spf13-vim into 3.0

Conflicts:
.vimrc
.vimrc.fork

	modified:   .vimrc
	modified:   .vimrc.before
	modified:   .vimrc.bundles
	modified:   .vimrc.bundles.fork
	modified:   .vimrc.fork
	modified:   bootstrap.sh