Worked some more on data table stuff
Annotations are now in btv.database.annotation