Merge branch 'jk/help-alias'

* jk/help-alias:
  help: respect aliases
  make alias lookup a public, procedural function
  help: use parseopt

diff --cc Makefile
Simple merge

diff --cc cache.h
Simple merge