Add solarized
Merge branch 'master' of github.com:ScottWales/configs

Conflicts:
	vimrc