Merge pull request #5 from nh2/nh2fixes

More pass-through fixes
Add --supported-languages to flags conflicting with -M