Make Travis work again, and fix jshint errors

Fixes all the tests and makes Travis work