Rewrite vimrc and clean up.  Change default colorscheme as well, since solarized wasn't working properly.