Bring master up to date with mrjob 0.4