allow arbitrary system dir, and other odds/ends.
Merge branch 'master' of https://github.com/cjdaly/napkin.git