Use rjsmin instead of slimit for minimizing JS.
Merge branch 'master' into consulting

* master:
  Use rjsmin instead of slimit for minimizing JS.