setting default font
tweaks to tests
Merge branch 'master' of https://github.com/aaronzirbes/vim-files

Conflicts:
	vimrc