Move documentation into doc/

and tidy up some other things.
resolve conflicts in nfs52 to master merge