Refactor Xresources
Add dynamic font resizing to urxvt and (g)vim
Merge branch 'integration' into master