Merge remote-tracking branch 'origin/request_timeout' into request_timeout+save-to-es
Merge remote-tracking branch 'origin/save-to-es' into request_timeout+save-to-es

Conflicts:
	pillowtop/listener.py