Merge in master changes: Xdefaults, Makefile, colorschemes, etc