2 quick fixes

cc: @jeme @ksperling

One fix supersedes #91, and the other fixes a JSHint error in `Gruntfile.js`.