Reverting temporary changed code.
Fixed PDF importing which I broke in recently.
Finally nicely integrated out highlighting Annotator plugin.
Conditionally load out PDF text mapper for PDFs.
Updated README.