Merge pull request #12 from jordandukart/7.x

Put the pid in the block for use in filtering when to display the block.
Drupal Coding Standards
Merge pull request #14 from nigelgbanks/7.x-coding-standards

Drupal Coding Standards
Merge branch '7.x' of github.com:Islandora/islandora_bookmark into 7.x-release
Merge branch '7.x-release' of github.com:Islandora/islandora_bookmark into 7.x-release
Updated version number for 7.x-1.1-RC2