Be smarter when creating aliases for merged teams
Use a polymorhpic association for Alias

This properly enforces uniqueness and fixes a couple edge case errors
Fix dupe column in migration. Update structure file.