Added aliases and colors to gitconfig, updated bashrc