Package assets into main r.js scripts

- Allows us to use async in script tags
Merge branch 'async'