Update marionette, clean up files, and update readme.