Merge branch 'jc/blame' into jc/web-blame

* jc/blame:
blame: Document and add help text for -f, -n, and -p
Remove git-annotate.perl and create a builtin-alias for git-blame

diff --cc Makefile
Simple merge