Bundle in es6-shim but leave es5-shim as optional

Also added a note to the documentation.