catch missing git-annex stuff better, and simplify deps