Adjusts colors for xterm-256
Merge branch 'master' of https://github.com/LawrenceJones/dotfiles

Conflicts:
	bashrc