Setting DISPLAY every time is not a good idea.
Add recursive grep shortcut.
Add a copy of Solarized Xresources Color Scheme from github.com/solarized/xresources@533219b
Add comments.
Display git short sha into prompt.
Update prompt style.
Default git prompt extensions aren't great.
Remove empty line.
Set root prompt with flashy colors.
Merge branch 'master' of github.com:kdeldycke/dotfiles

* 'master' of github.com:kdeldycke/dotfiles:
  Set path and lang first.
  Only force VIRTUALENVWRAPPER_PYTHON on OSX.
  Do not override which.

Conflicts:
	.bash_profile