Some basic JSHint linting
Optimize a couple if blocks
Merge pull request #2 from jrsquared/master

Just some linting.  Missing semicolons, whitespace issues, optimizing if blocks...