Merge pull request #34 from csmith/master

Use a per-host fallback.
Tidy template a tad.