upgrade marionette to 2.1.0 (includes some ugly region hacks)