Follow up to 20 redirects.
Merge pull request #93 from square/jwilson/redirects

Follow up to 20 redirects.