Working on documentation problems. I would like to keep sphinx's autodoc module going, but might rewrite in order to have more readable documentation.
Merge remote-tracking branch 'origin/master'