Use black solarized.
Merge branch 'master' of github.com:r0man/dotfiles

Conflicts:
	.Xresources