changed 'funny cats' to 'gangnam style' for better test resilience
Merge pull request #102 from yoniYalovitsky/TEST_FIX

Thanks, merged the changed video test.
Merge branch 'master' into django_1.5