Merge branch 'split-out-bibles'
Calling calc-plan when Books at a time? is changed. EOM
Correctly calling through to order by book rather than by straight plan. EOM