I was having trouble getting the sphinx tool chain with the plugin setup.  I'll try to get a valid sphinx tool chain so I can validate the docs also.  I'll incorporate your diff.