Added support for the 'api_params' parameter of boto (fixed conflicts)

Just #868 with a merge commit from master and a little testing cleanup. @ashkop and @davidmarin should make sure the right things were preserved. @ashkop, if you give me your `Full name <email address>` string, I'll add you to the contributors list in `mrjob/__init__.py`.