Git: Add new, remove stale and reorganize aliases