Fix fonts

Fix fonts to stop the deprecated warnings.  Use xinitrc.
Merge branch 'master' of github.com:ejstacey/dotfiles

Conflicts:
	.xinitrc