More modular vimrc and moves from solarized to hybrid