updated bashrc
reorganizing bash function for parsing git branch