Merge pull request #180 from adam-vessey/7.x

Squash some warning in the XInclude shenaningans.
General usability.

Blocks are now useful when the islandora_solr() display is present
on other pages.
Merge pull request #181 from adam-vessey/7.x-UCLA-10

General usability.