updated Annotator. added bin/annotate. moved train,test to fit, predict