Reorganize aliases to support multiple files

This allows me to have multiple alias files, since some of them I don't
want to check in to source control.