Merge
Change to zenburn colorscheme for vim; Xresources coming
add xresources