Enforce status line to always be on
Simplify vimrc
Merge branch 'master' into comp

Conflicts:
	vimrc