Updating jshint
Lint pass
Removing unused function from matador.js
Fixing wrong variable name
Consistent use of quotes
Merge pull request #117 from Obvious/vinny-lint

Lint pass, fixing issues raised by the linter