Housekeeping:
* Fix code for jshint issues
* fix code for Karma issues
* grunt runs