WIP: Better doc build
ENH: Better doc building
Merge pull request #227 from Eric89GXL/fix-docs

FIX: Fix docs (somewhat)