The discussion on numpy ML isn't yet finished. I propose to merge as is, then at some point make the whole codebase consistent with the outcome of that discussion. This PR fixes about 300 warnings during doc build and has quite a bit of new content as well, so I don't want to leave this out of 0.12.0