update
merging freberry/git-annex into git-annex