back to solarized
Merge branch 'master' of github.com:rpatali/dotFiles

Conflicts:
	vimrc