Documentation updates

Also, updated to use VARIANTS rather than __variants__, as this shows up
properly in older versions of sphinx.