use `do...end` for multi-line block
space out `protected` and remove trailing spaces
Fix Malformed PullReview conf file
Merge remote-tracking branch 'toch/fix-style-issues'

Conflicts:
	core/app/views/refinery/admin/_locale_picker.html.erb