Add test for escaped params.to_json in Rails 3
Fix warning on `params.to_json`
Detect Rails 3 json escape config option
Remove deprecated config locations
Merge pull request #309 from presidentbeef/to_json_false_positives

Fix `to_json` false positives
Merge pull request #310 from presidentbeef/remove_deprecated_config_locations

Remove deprecated config locations
Test for Model.id XSS false positive
Treat #id as safe
Oops, add _models.html.erb test file
Merge pull request #312 from presidentbeef/dont_warn_on_id

Don't warn on id calls
Fix errors raised on reports which use --separate-models option

* warning_code was missing, and the fingerprint method on warning relies
on it always existing
Merge pull request #313 from noahd1/missing_warning_code

Fix errors raised on reports which use --separate-models option
Only treat controllers like controllers

and treat non-controller classes in controller files
as if they are modules that might contain a controller
Convert class name to string for 1.8
XSS test for controller nested inside class
Merge pull request #315 from presidentbeef/deal_with_controller_inside_class

Only treat controllers like controllers
use codeclimate status image replace codeclimate logo
Merge pull request #319 from zlx/zlx/use_codeclimate_statue_image

Use codeclimate status image to replace codeclimate logo
Merge branch 'master' into better_file_name_handling_for_warnings

Conflicts:
	test/tests/test_rails3.rb