bashrc: Use simpler way of getting the current branch
Merge branch 'master' into BHAC