Add solarized color schemes for Vim

Interestingly, needed to move loading below bundles for Macvim
more playing with diff and merge tools.

Still not sure what source tree is doing here. looks wrong.