Update copyright
Bump version number
Even more copyright update
Merge branch 'multiple_config_files' into release_033
Merge remote-tracking branch 'origin/multiple_config_files' into release_033
Updated changelong and whats-new
Merge branch 'multiple_config_files' into release_033
Merge branch 'multiple_config_files' into release_033
Merge branch 'master' of https://github.com/Yelp/mrjob into release_033
Make release tag line more like duck duck goose
fix test_conf py2.5 compatibility issue
Silenced some tests which were throwing deprecation warnings but won't in 0.4
Test case for counter parser version
Actually support env vars/~ in includes
Job log URI regex is even more general, and actually backtracks less
Document python 2.5+ requirement
expand regex to account for INFO: being prepended to logs
Move all options from mrjob.job to mrjob.options
Split deterministic resource disposal into separate branch
Removed extraneous close