comment out font declaration
Merge branch 'cfml' of git://github.com/jphustman/spf13-vim into cfml

Conflicts:
	.vimrc.fork