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 branch 'master' of github.com:migurski/TileStache

Conflicts:
	TileStache/S3.py
	scripts/tilestache-seed.py
JSON all the things – untested
add getTypeByExtension to MBTiles; remove merge cruft (in S3.py); bump VERSION
update tilestache-seed.py to reflect reality; not sure how that happened
Merge pull request #102 from straup/master

Teach MBTiles.py to serve JSON