Fix grunt jshint order and fix js