fixed typo in exception message
support for osgeo.ogr for reading OGR geometries (besides direct use of libgdal)
update GDAL/OGR docs for windows
update deployment documentation (no longer recommend FastCGI)
raise ConfigurationError for unknown merge_methods
document merge_method
update CHANGES.txt for 1.6
fix tms demo page when 'use_grid_names' is enabled
Merge remote-tracking branch 'upstream/master'
Merge pull request #79 from ramunasd/master

Fix tms demo page when "use_grid_names" is enabled
fixed log redirection in upstart example
add wmts.md to configuration spec
avoid KeyErrors for partial seed configs
convert layers to string before splitting to handle numerical layer names
removed old origin option from cache example
update cache.grid explaination in docs
removed old notes for configuration changes in 1.2.0
update image.encoding_options.quantizer docs for Pillow
fixed encoding issues when piping wms-capabilities with umlauts
do not keep min/max_res of one source when other sources have no min/max_res