revert Tilestache/Sandwich.py to master