Merge pull request #24 from marcwebbie/master

Changed some variable names, added tests for exceptions and modified data files for faster tests
Try using only ffmpeg from the debian repo
trying to fix travis build error
looks like we need libavcodec-extra-53
Merge .travis.yml changes from remote-tracking branch 'upstream/master'