Moving the location field to a ForeignKey instead of a choice table to allow for user customisation (this commit will destroy your data).