Merging VEP annotator and pop freq store into annotator. They are now just sublcasses, not standalone entities