change to Xresources
Merge branch 'master' of http://github.com/tkimva/emacs