Add bash_aliases, update bashrc for Ubuntu
Fix parse_git_branch in bashrc