fix: resolved conflict
fix: many miscellaneous fixes - mostly styles - but also for doc building the ipython extension has moved to ipython
fix: remove code added by oscar
fix: clean up auto tests
Merge pull request #940 from satra/fix/misc

Fix/misc
resolved conflicts