Updates mainly to work with Beets master

Several things in Beets changed since last I touched it.  The edit
plug-in should work now.  I also cleaned up the code a bit.