(cherry picked from commit 4c266e12)

(cherry picked from commit 8480fa09)

(cherry picked from commit 518a10e7)

- Note that the database upgrade tool must be run after loading this commit to ensure that the shortlinks table's hash column is correctly populated.

(cherry picked from commit 7732da3c)

Otherwise this would depend on other facets being enabled.

- Includes expanded test coverage.

- Thanks to Leila Gonzales for the fix.
- See https://github.com/stamen/maps.stamen.com/issues/167 for details.

Also adds a missing parameter.