fix requirejs config and upgrade marionette