Extra line, no hidden
Changed the guifont to Terminus
Merge branch 'master' of github.com:roblund/dotvim

Conflicts:
	.vimrc