osx stuff with fonts
Merge branch 'master' of github.com:joakin/.vim

Conflicts:
	.vimrc
Fix terminal problems