Ad hoc search for Agent, Customer, Contact.
Merged
Delete WEBDEV THOUGHTS
added s3
fixed syntax
Merge remote-tracking branch 'upstream/master'

Conflicts:
	queue_listener/simple_db.py