Reorganize .bashrc a bit. Fixes git PS1 status. Fixes some colors in
urxvt/vim