Updated .bashrc
Changed directory color in dir_colors
Updated git config for the lab
Merge branch 'master' of ssh.github.com:atextor/dotfiles