Making 'make sphinx' work
More cleanup