zotero mapping init
Merge branch 'master' of https://github.com/proquest/syn

Conflicts:
	index.js
Merge branch 'master' of https://github.com/proquest/syn