upgrade to git-diff to remove old editor stuff
upgrade to bookmarks to remove old editor stuff
upgrade to find-and-replace to remove old editor stuff