Updating documentation
Updating documentation
Merge branch 'feature/documentation' into develop

This feature branch updates documentation, hopefully fixing some of the Sphinx Issues