Yelp/mrjob — pull request #546 by irskep (2012-08-27 21:11:08+00:00)
Title: Merge 0.3.5 again and fix a few issues

* More `JSONDecodeError` stuff
* `shlex.split()` was failing in a bunch of places so I wrote `mrjob.util.shlex_split()`
* Various merge conflicts from `release-v0.3.5` that I somehow had missed before

I absentmindedly reordered some imports. I can change 'em back but I kind of like the new way better.