fix typo

closes #46
Merge pull request #47 from jerry57/master

Deprecating keywords to prevent overlap, code cleanup, added keyword documentation file and included changes from rbovill as well
bump version
bump version