Some bugfixes.
Merge branch 'master' of https://github.com/pieterdp/zotero-styles
Bugfixes to conform to CSL