Merge branch 'staging' into production
Increase save_thumbnail_in_s3 time limit to 10 seconds
fixed dockerdev setup with cidfiles dir
Better way to read thumbnails

For some reason, urlopen() was hanging when handling HTTPS URLs.  The
requests library handles it much better, and also supports a timeout
option.
Increasing the timelimit for thumbnail task 1 more time.

I think this timeout makes more sense when we are also setting a
timeout for fetching the URL.
added eventlet for celery
added eventlet to reqs
Pinning billiard to a previous version.

The newer version seemingly broke the celery queue.
Update integration repo (#915)
Fixed generating counts for the video sitemap

This fixes a really slow query that's been taking the site down.
Step using eventlet celery pool.

Now that we fixed billiard to version 2.7, we can go back to
processes.
Merge branch 'production' into staging

Conflicts:
	apps/videos/tasks.py
	optional/unisubs-integration