Merge pull request #2 from karmatics/useServeContent

Use serve content

merge karmatics:useServerContent

TODO: See if we can use ServeContent for bundled files, too