Fixed all the queries to reflect the new relationships.

Now counting concepts and resources in the object labels.
Merge pull request #15 from nigelgbanks/Smithsonian-tree-count

Fixed all the queries to reflect the new relationships.
Used wrong hook for theme, thats why calls to drupal clear cache were needed to have the settings forms work.
Fix for default display of datastreams.
Merge pull request #3 from discoverygarden/Smithsonian

Smithsonian