updated rails and marionette