Fix sync
Merge pull request #1 from guywithnose/master

Fix sync
Make the math more resilient.
Merge pull request #2 from nubs/master

Make the math more resilient.
Cache watermark
Merge pull request #3 from guywithnose/master

Cache watermark
Merge pull request #4 from nubs/master

Sync branches.
Updates for CTOL Video site
Merge pull request #5 from toldavidorick/master

Updates for CTOL Video site