Set default settins for solarized scheme.
Merge branch 'master' of github.com:dkinzer/.vim

Conflicts:
	.vimrc