Fix all the lint noise, mostly semicolons, duplicate var definitions and ==0
Merge branch 'devel' into lint-fixes
Merge pull request #142 from Robert-Nelson/lint-fixes

Lint fixes