completed mapping of twitter entities to internal mappings. closes #21
fixing model changes to all packages