vim status line
Merge branch 'master' of github.com:browny/dotvim

Conflicts:
	vimrc