Linted

Removed trailing whitespace and uncessary semicolons.
Added some missing semicolons.
Cleaned up spacing a bit.
Fixed some duplicate variable declarations.
Merge pull request #41 from caseypt/linting

Linted