Merge pull request #48 from wesleykendall/develop

entity uses updates rather than defaults when upserting entity kinds
working on sub_to_kind_stuff
commit to create and evaluate pull request.
cleaning up a bit
more cleaning up
more cleaning up
reworded docstring
flake8 fix
address pull request issues.
Merge pull request #50 from robdmc/sub_to_kinds

Sub to kinds
Update version.py
adding entity_kind to __init__.py
Merge pull request #52 from robdmc/entity_kind_add

adding entity_kind to __init__.py
Update version.py