removed console logs
modified tarball
cleaned up some comments
Merge branch 'master' into test
not sure what these test files are, but they are in there