Merge branch 'teasp00n-solarized-fix' into 3.0

Conflicts:
	.vimrc

Author: spf13

.vimrc

@@ -162,8 +162,8 @@
     if filereadable(expand("~/.vim/bundle/vim-colors-solarized/colors/solarized.vim"))
         let g:solarized_termcolors=256
         let g:solarized_termtrans=1
-        let g:solarized_contrast="high"
-        let g:solarized_visibility="high"
+        let g:solarized_contrast="normal"
+        let g:solarized_visibility="normal"
         color solarized             " Load a colorscheme
     endif