Making links and keyterms work at once for now
Merge pull request #37 from khandelwal/master

Making citations and keyterms work together (for now).