Rookery

I was also pleased to find that all of the writing I did this week took place within waterline. I thus made constant use of rookery, and filed a few minor bug fixes (mostly to do with CSS) to the upstream dev branch.