Adding Jake Maul's patch to reduce overall server load by letting Zeus cache for a short period.
increasing UA timeout from 5s to 10s... helps prevent accidental disabling
deactivate_sth doesn't exist, should be update_sth
missing log line for 403/404 failure codes
Merge pull request #21 from brandonsavage/bug804293

Bug 804293 - Fixing a persistent notice that appears when GEOIP =
Merge branch 'master' of github.com:mozilla/tuxedo into bouncer-tests

Conflicts:
	bouncer/php/index.php