Reorganize aliases, extract computer-specific config to unversioned .extras file