some cleanup
Merge branch 'issue_8' of github.com:sdether/josh.js into issue_8