Merge pull request #46 from wesleykendall/develop

updated the unicode method for entity kinds
entity uses updates rather than defaults when upserting entity kinds