refactored the slabs to separate the annotation from the span.

many things are cleaner. some are not, will make dealing with the
CRF etc. easier.
Merge branch 'slabfactor'