add draw_in_legend option to icon style
remove collage
use a table for collage item options in the popup
remove symbol in popup by request
rm search popup
speed up filter and parameter name retrieval
merged
pass timeout
Rename _cached_unit to cached_unit
Move to mapnik 2.2.0
Rename mapnik.PointDatasource to mapnik.MemoryDatasource. Mapnik 2.2.0 change.
Provide id for `add_datasource_point`. Mapnik 2.2.0 change.
Move to mapnik 2.2.0.
Merge branch 'lizard5-demo' of github.com:lizardsystem/lizard-fewsjdbc into lizard5-demo
USe host specific cache keys.

Multitenancy needs a different cache per host.
Fix missing '%' in string.
Change place of get_host utility.
Pep8 changes.
Remove dependency on lizard-task.

Just use regular celery.
Update task cache --deep to use with celery.