More vimrc cleanup
Fix solarized misconfig
Merge branch 'master' of github.com:Xlator/vim-config

Conflicts:
	.vimrc