Remove duplicate setting in vimrc
Clean up vimrc, Solarized color scheme