Merge remote-tracking branch 'upstream/master'
Changes to allow the javascript and container page to be at different context roots.
Merge pull request #43 from ryanjbaxter/master

Allow the javascript and container page to be at different context roots