use mustang colorscheme for uxterm
Merge branch 'master' of github.com:natano/dotfiles

Conflicts:
	Xresources