Add timeouts to http requests
Merge branch 'master' of github.com:sandwich-share/sandwich

Conflicts:
	sandwich/webapp.py