Remove dupe "mp4" and group extensions somewhat.
Merge pull request #17 from Freso/clean-extensions

Remove dupe "mp4" and group extensions somewhat.
Merge remote-tracking branch 'origin/master' into freso-tweaks