A few more fixes for jshint bugs: Model and Router

Closes #26