account for package renaming hoohah in newer versions of boto
Merge branch 'master' of github.com:migurski/TileStache

Conflicts:
	TileStache/S3.py
patched tilestache-seed to allow for retries and to write failed tile requests to a log file
Merge pull request #61 from llimllib/master

Fix a documentation bug
Merge pull request #62 from llimllib/master

print a better error if you start tilestache-server with an invalid config
Added details about serving with uWSGI
Adding details about uwsgi options
Merge pull request #64 from davidjb/master

Adding details about serving with uWSGI
Using new render function in mapnik utfgrid provider
And so there are no need for merge_grids function
Bumped to 1.36.1 with more Memcache disconnect_all() calls
Added Proj4Projection class.
Added synopsis for module.
Replaced most 256's with Layer.dim for future non-256 tiles
Hintily hinting that only tile heights are actually verified
Added configurable "tile height" setting for layers
Merge branch 'proj4' of https://github.com/kartena/TileStache
Bumped to 1.37.0 with "tile height" option for layers and Proj4Projection class
Correct error message
Add optional 'layer_id_key' parameter for mapnik grid provider.
Adds the source mapnik layer name, keyed by an configurable identifier to each
data item in a mapnik grid. Useful for identifing data item types when multiple
mapnik layers have been merged into one grid.