Two new castles

Also contains a few minor fixes for the previous batch of new castles.

These are some fairly conservative alternate castle designs.