Merge branch 'parse_setup_cmd' of github.com:davidmarin/mrjob
Merge remote-tracking branch 'origin/setup_regression_tests'
Merge branch 'setup_regression_tests' of github.com:davidmarin/mrjob
Merge branch 'master' of github.com:Yelp/mrjob
Merge branch 'master' of github.com:Yelp/mrjob
added max_hours_idle option
we now infer region endpoints (fixes #658, #621)

factored a lot of AWS administrivia out of emr.py into aws.py
added max_hours_idle functionality, going to try it out
got create-job-flow to set an IsIdle alarm
added comment explaining what we'd need to do to give CloudWatch the info
it needs to terminate idle job flows' master nodes, and why it doesn't
work anyway
ripped out class-based protocols (fixes #486)
updated protocol tests to use instances
fixed test_job
PEP8ing as long as I'm touching this file
use "self", not "cls"
Merge pull request #698 from davidmarin/make_protocols_instances

Make protocols instances
Update wqardaji's email in __credits__
Partially functional sphinx extension
Output a proper table for opt ref
Option subsets