Working on getting sphinx-apidoc to work
Fixed merge