Use the new naming convention for the per-user hook points.
Use 'cat -' as the man pager when using manpageview.

This is mainly for any long-term shells that I've been running that
haven't picked my etc change.
Merge branch 'js/mine'