Merge branch 'halawa_kelvinator' of github.com:Stanford-Online/class2go into sef-kelvinator
Move kelvinator command under kelvinator dir
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-kelvinator
hotfix #773 copy default.html to msande111
New deploy method: update, checkout, reset (#766)

No more using the git chef resource, just execute:
- git remote update
- git checkout -f <branch>
- git reset --hard <branch>
Merge pull request #774 from Stanford-Online/sef-work

Pull sef-work --> master: New deploy method: update, checkout, reset (#766)
#768 csv import
take out dup delection in csv import# 768
Merge pull request #775 from Stanford-Online/jbau-celery-email

Jbau celery email
merged in sherif migration
Merge pull request #778 from Stanford-Online/jbau-9-21-merge-halawa

merged in sherif migration
somehow deleted import of reverse, fixed
Merge branch 'master' of github.com:Stanford-Online/class2go
Removing sample videos (#765)

If we want sample content, we shouldn't just use prof content without
asking like this.
Merge branch 'master' of github.com:Stanford-Online/class2go into sef-kelvinator
Add comment - consider "INFO" for settings.py (#689)

./manage.py kelvinator is better with info level logging to console, I
wonder if this is OK for other commands?  What else goes to console?
Kelvinator as a celery task (#765)

A bunch of changes
- Bring in Sherif's changes
    - #642: Script to manually kick off a Kelvinator job
    - #564: Kelvinator threshold resuls in way too many slides...
    - #501: Kelvinator rewritten to take out the shell script
- switch from storing output into a "report" interim variable to using
  standard logging.  This way you get console output when running as an
  interactive command (manage.py) and isolated log files when a celery
  task.
- Celery task.  Moved the entirety of the former kelvinator.py into
  tasks.py to follow convention.
- Still only two parameters, s3 path and desired number of frames per
  minute.
- Better handling of config option.  Now if you specify a
  "KELVINATOR_WORKING_PATH" then we do our work there, otherwise we
  create a temp dir in /tmp/kelvinator-$ts, where ts is epoch time.
- Throw exception on error instead of just print warnings.  When we fail
  on a job we want to be vocal about it (send mail, etc) since we don't
  have requeue/retry logic in place.
- Added a fudge factor to ffmpeg to skip the initial three seconds of a
  video.  This was empirically determined from watching a few videos and
  noticing that we are consisitenly skewed vs. YouTube and watchcing the
  video directly.  This is clumsy and a bit dangerous.

Still to do:
- For static videos we should have a slide every X seconds at least, say
  30 seconds, for better navigation
- Handle translations and rotations, this still does very poorly on
  panning or shaky video
- write to DB instead of S3
- retry logic on S3 download / upload.  Right now it is fragile
- Integrate rekelvinator.
Remove KELVINATOR_WORKING_PATH since default is OK (#765)

It will be a rare instance that someone will want to set this.
Remove old differenceFrames.py (#785)

Long since absorbed into main-line tools.
Remove old kelvinator backdoor UI (#765)

This was an old attempt of a way to manually kick off kelvination,
but the new manage.py interface is much better.  Now this form
longer works, and if someone stumbles across it only bad things can
happen.