manually pull in changes from #37
fix jshint stuff