switch from .Xdefaults to .Xresources loaded with xrdb -merge from .xsession
gitignore
Merge branch 'stow' of github.com:williamscales/dotfiles into stow

Conflicts:
	.gitignore
make sure .gitconfig itself stays out of git