Merge rubocop files together as well, it's not a todo list anymore