updating to marionette 2.0