Add aliases for vcsh and git-annex
Merge branch 'master' of sym.noone.org:git/zsh