index.rst fixes
testing out autodoc
fixing merge conflict
rebuilding docs'