tooling and cli scripts update
Merge pull request #18 from bennmapes/tooling

tooling and cli scripts update