Replace "shape" with "geometry" throughout.

This is as discussed in #443. Let's see what the build-servers think of all my renaming.

It required touching a lot more files than I expected - largely in RigidBodyWing and friends. @andybarry do we have good test coverage there?