Added gui font support for living room
aka grasslands on tv
Merge branch 'master' of https://github.com/pilf/vim-files

Conflicts:
	.vimrc