Some changes to vimrc concerning Solarized.
Fixed conflicts in the vimrc.