removed Xdefaults and added Xresources (deprecated)
Merge branch 'master' of https://github.com/esn89/dotfiles