Refactoring of flavour wheel to attempt to reduce duplication. Still horrible. Added more flavour wheel tests and fixed match test