Add --emr-api-param and --no-emr-api-param options.
Added tests for --emr-api-params and --no-emr-api-params.
Added docs for --emr-api-params and --no-emr-api-params.
Fixed docs for --emr-api-params and --no-emr-api-params.
Update EMR tool ISO8601 parsing to be consistent with EMR runner.
Fix typos.
Remove internal no_emr_api_params parameter. --no-api-param switch is still available.
emr_api_params overrides all other parameters.
Modify mockboto to generate ISO8601 date times with milliseconds.

Making this change resulted in some test failures, so there are
additional changes to make the tests pass:
 * move iso8601_to_* functions to new file mrjob/conversions.py
   (this breaks a dependency loop between mrjob/emr.py and
   mrjob/pool.py)
 * change mrjob/pool.py to use iso8601_to_datetime
 * update reference to mrjob.emr.iso8601_* to
   mrjob.conversions.iso8601_*.
#863 Update documentation to reflect AMI 2.x and AMI 3.x differences
Merge pull request #877 from geota/master

Update documentation to reflect AMI 2.x and AMI 3.x differences. Fixes #873.
Merge pull request #874 from anusha-r/master

Fixing a typo in docs, for the newly added iam-job-flow-role option
Explain why you can't put run code in a job file
Explicitly list exception when trying to use make_runner() wrong
Dedup run_and_get_job_flow() in several EMR tests
Merge remote-tracking branch 'yelp/master' into api-params

Conflicts:
	mrjob/options.py
	tests/mockboto.py
	tests/test_emr.py
Remove mrjob.conversions and move its contents to mrjob.parse.
Merge pull request #878 from irskep/explain-run-separation

Explain why you can't put run code in a job file
Merge pull request #870 from drbsg/iso8601_fixes

Update EMR tool ISO8601 parsing to be consistent with EMR runner. Fixes #869.
Fix emr_api_params alphabetization
Merge pull request #879 from irskep/api-params

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