Update for changes on Magit's "next" branch

Make magit-annex work with recent changes to Magit's "next"
branch (b2f5ab35c). While everything seems to be in a functional state,
several of the annex functions have diverged a bit from their Magit
counterparts, so I should see if other parts should be updated.