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