Add and select vim theme: hybrid
Merge branch 'master' of github.com:homburg/vim

Conflicts:
	vimrc