formatting
Merge branch 'master' of github.com:DavidVorick/mkvsynth into singleFunctionFilters
didn't want to stash