Simplified mrjob.conf configuration
Merge remote-tracking branch 'prof/master'