Upgrade marionette from 1.1.0 to 1.6.1

Fixes #377.

See notes in #377 about the issues in Marionette that were causing this problem and have since been fixed.