Cleaned up minor code formatting issues, upgraded sphinx for doc generation which required merging of Makefile and src/doc/src/conf.py, removed 'dev' tag from setup.cfg and doc conf.py to prepare for release.