Solarized
Merge branch 'master' into nojedi

Conflicts:
	vimrc
Merge branch 'nojedi'

Conflicts:
	vimrc