Update RequireJS to 2.1.11 from 2.1.5.

The optimizer is currently from version 1.x and needs to update to make
the `shim` configuration option available. Update RequireJS to match the
new optimizer before updating the optimizer.

`require.js` is from
http://requirejs.org/docs/release/2.1.11/comments/require.js.
Update the RequireJS optimizer to 2.1.11 from 1.0.2 for the `shim` config.

- `r.js` is the RequireJS packing script from
  http://requirejs.org/docs/release/2.1.11/r.js.

- `js.jar` is Rhino from
  https://github.com/jrburke/r.js/blob/master/lib/rhino/js.jar?raw=true.

- `compiler.jar` is Google's Closure compiler from
  https://github.com/jrburke/r.js/blob/master/lib/closure/compiler.jar?raw=true.

Also, see http://requirejs.org/docs/download.html.
Add the `shim` configuration to the RequireJS optimizer.

Match the RequireJS configuration in the client `index.html`.
Use a local `merge` function to remove the dependency on jQuery.