merge changes from git-annex
Fix build with github 0.9.
prep