wip
state.annotator now takes a tag
parseTag now takes a Tag
Merge pull request #316 from davecheney/137-names-refactor-part-ix

137 names refactor part ix

* state.annotator now takes a tag
* parseTag now takes a Tag, rejects nil tags.