Remove stray encoding directive from the Bounty model.
Replace the custom User.artist? method with the Ruby built-in is_a?(Artist).
Merge branch 'master' into filters-devel