Rubocop: Update for new cops and rails config [DO NOT MERGE]