Remove dependency on avconv, just use ffmpeg
Merge branch 'master' of github.com:choptastic/watchmecode