David waiver

merging between two branches was a bit fraught. In the end I merged Bill's waiver branch into mine, struggled to resolve conflicts with the crew.sql and first_captain.sql (think i got it right) and did a little testing. This seems to work now with the revised waiver accepted field.

Let's pull it into master and do some testing.