add semicolons, fix mixed tabs/spaces
Merge pull request #21 from moretti/master

Code cleanup to make it jshint-compliant