Merge pull request #152 from cherba/lint

Fix new lint warnings/errors.