Make markers non-persistent.
Destroy markers when you delete them.

The resolved side should be taken care of when the editor is closed.
Merge pull request #32 from smashwilson/already-opened

Mark conflicts properly in already-opened editors