wrapped calliope function in emicdora callback
removed failing refences to unused annotator code
added wrappers for calliope callback
adaptations to allow for editing
merged with current
changed function name
changed function name
fixed merge conflict
stashing
added emicdora wrappers
Merge pull request #12 from ajstanley/EMiC-152

Emic 152