Redo magit alias

Make better use of the ec script, and clean up ec, et and es.  This is
the stuff I would like to put in a blog post