Updating aliases and fixing osx git branch issue.