Coloured terminal status line
Merge branch 'master' into dvorak

Conflicts:
	_vimrc