Merge "Remove "jshint evil:true" where not required"