Merge git purr and pupp aliases