Fixed up some things.
Merge pull request #46 from Jedwondle/master

Fixed up some things to get rid of jshint issues.