Fix nbconvert.py to be compatible with old CMD arguments
Merge branch 'master' of github.com:ProgramFan/nbconvert