added fill_timeseries_annotation_data
Merge branch 'master' of https://github.com/urinieto/jams