Name tag is no longer rendered in villager editor
Held items sorted out. #18 is no longer an issue.

Workaround is acceptable, since working villagers may not actually have
the item they are supposed to be holding.