Use new vars for redirects.
Include redirects in all.
Merge pull request #72 from csmith/master

Fix up redirects.