Update rubocop, AndOr fixes
AndOr cop final check
IndentationConsistency cop checked