Adding faire taxonomy to event-items, and some bug fixes.
Merge branch 'cole'
Restoring JDB sync
Merge branch 'cole'
no message
Merge branch 'master' into cole
ending efforts to fix the character encoding for now