wms branch merge?

Are you guys going to merge the wms branch into master? If not, what else needs to be done on the wms capability?

I'm planning on doing it soon. I'm currently working on something else
and haven't had time. All that is left is to write some unit tests for

Tom, it probably needs doc too, right?

Ashley, in the meantime we can merge master into the wms branch if it would help you. Actually, we should do it regardless.



So the doc needs some review but it should be pretty close.

Also, master is now in the wms branch.