Implemented type field for annotation set, changed api.py to account for this, as well as updated unit tests.

https://catami.atlassian.net/browse/CAT-647