added tests, removed some extraneous functionality
cleaned up package.json
Merge branch 'master' of github.com:iamcdonald/forestry