jshint fixes
Merge pull request #54 from maraoz/bug/fixing-some-things

jshint fixes