Rebase to Marionette + Requirejs