Additional test case from FlyBase
Refactoring AgnGeneLocus, replacing redundant functions with macros
Merge branch 'master' into locus-refactor