Merge branch 'master' of github.com:mshade/dotfiles

Conflicts:
	.Xresources