tests for NNexus::Annotate, small enhancements and patches in the process
Merge branch 'master' of https://github.com/dginev/nnexus