Merge branch 'staging' into production
Don't make tab move the subtitle focus (#965)

The issue was that bound the tab key to 2 different actions:
play/pause and navigating to the next subtitle.  When the user hit it,
we were doing both.  In the case of 1 subtitle, we would just let that
subtitle lose focus.

Changed it so tab only toggles play/pause.  Also made the other
keybindings when editing subtitles (enter/escape), not propagate
upwards.  This way if we add a global keybinding for one of those, we
won't have both actions fire at once, which was a confusing part of
this issue.
Merge branch 'staging' into gh-965
Update integration repo (#915)
Merge pull request #1013 from pculture/gh-915

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.
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 pull request #1018 from pculture/gh-965

Gh 965
Build docker images automatically on the first run
Removed command to change /etc/hosts

This was needed for docker version 0.6.1, but in the latest version
(0.6.5) it's no longer needed and in fact causes in an error.