clean up sublime plugin merge cruft