Merge pull request bblfsh#29 from abeaumont/fix/multiple-roles-in-ann…

…otations

annotations: Include multiple roles

Merge pull request bblfsh#24 from abeaumont/feature/document-annotations

docs: Add autogenerated ANNOTATION.md

Merge pull request bblfsh#23 from juanjux/fix/more_simpleidentifier

Fix/more simpleidentifier

Merge pull request bblfsh#16 from juanjux/complete_roles

Some additional fine-tuning of annotations, fix