Add flag to turn on "rigid delta calculation"

[mpickering]

Plan

1. Add a new field to the SetLayoutFlag constructor to keep track of optional rigid blocks.
2. Add an option to Delta to enable the use the extra rigid blocks.