fixups .Xresource; tmux.conf.
Merge branch 'master' of github.com:i-kuzmin/dotfiles

Conflicts:
	.Xresources