substitutions and hooks mostly functional
Merge branch 'master' of https://github.com/atcheson/atch