Upgrade to 7.x from 6.x

[rbran100]

Current Features to be ported include:

• Allow users to add a HTML or Plain annotation Before or After a node's teaser
• The note should conditionally show based on plugin conditions

•   Include [context](http://drupal.org/project/context) plugin that allows you to show note only when a given context is active
  

•   Include a taxonomy plugin that shows note only when on specific term or vocabulary page
  

• contextual annotation plugins should add admin links to the node teaser when a plugins context is active

Additionally:

• Add ability to disable plugins via configuration interface.
• Use Drupal 7's built-in contextual links instead of openscholar specific hook in 6