rsids are optional and don't cause warnings if not there
Add error message for duplicate annotations
Merge branch 'updated' into gb_master