Merge pull request #145 from ajstanley/7.x

Merged Nicks changes in - updating mimetypes, and killing ISLANDORACM
Revert "Merged Nicks changes in - updating mimetypes, and killing ISLANDORACM"
Merge pull request #146 from Islandora/revert-145-7.x

Revert "Merged Nicks changes in - updating mimetypes, and killing ISLAND...
altered solr output
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_book into 7.x