Fixed problem where zotero oauth failure was raising a nonexistent exception
Merge branch 'master' of https://github.com/chnm/serendipomatic

Conflicts:
	smartstash/auth/views.py