Doc fixes
Updated with new setuptools bundles