Added both fonts
Merge branch 'master' of github.com:nscott/dotfiles

Conflicts:
	fonts/LiberationMono-Regular-Powerline.ttf