initial integration of perseus changes from balmas fork
added new config settings required by perseus branch, set to defaults for papyri.info;
 many changes ... need just to get into git will review later
various changes to support CTS citations
misc cleanup to prepare for merge to master
fixing comment for passage merge
putting papyri.info defaults back into default config files
putting papyri.info defaults back into default config files
handle timeouts after voting and disable timeouts for finalization diff
adding ability to edit/update from a linked urn
adding initial support for oac annotations and cts-specific implementation of such
fixes to oac annotations; added edit/update functionality
fixing typo in previous commit - inadvertent truncation of archived to d
Adding ability to delete an individual annotation; improving messaging in oacidentifier preview and enabling edit for finalization; add stylesheet for tei preview display
added annotation body selector interface for cts annotations; changed cts select citation link to bring user to confirm_edit_or_annotate screen for choosing task; disabled view in catalog link if the identifier doesn't have a link
made wiki link on index page configurable although really it should probably be the entire page
terminology change 'citation' references changed back to  'passage'; various fixes to language and javascript for cts oac identifiers edit screen
final interface tweaks made before athenaeus hackathon
changes from idiggreek to enable annotation of cts texts from external repositories ... may break creating new editions of CTS identifier subclasses
Fixed merge conflicts.