Changed tabs to spaces in Vim
and fixed an issue where Xresources wasn't being merged.