Update to latest master.  Has some bugs with things getting changed that shouldn't be, but it doesn't seem to lose any data.