Fixed up several aliases that were conflicting with the oh-my-zsh git plugin