Stuff
Merge branch 'master' of github.com:kellyjosephprice/dotfiles

Conflicts:
	.Xresources
	.bashrc.local
	.config/awesome/rc.lua