update
merging kitenet/git-annex into git-annex