changed the font back to liberation mono
Merge branch 'master' of https://github.com/acoustichero/dotfiles

Conflicts:
	.vimrc