Merge develop into master for release of v2

🎉 All functionality is fully operational and well tested! V2 notebook is updated, V1 notebook is still runnable.