add status bar
Merge branch 'master' of https://github.com/colt-xie/vim

Conflicts:
	.vimrc