More work on emotediff command.  Also cleaned up the todo list a little.