Integrate Rubocop; lots of cleanup thereof

Not totally done, but the rubocop-todo contains all the remaining tasks