DESTROY ISLANDORACM!!!
Guess what @ruebot forgot to commit and push???
resolved conflicts
Merge branch 'ruebot-7.x-ISLANDORA-962' into 7.x
Merge pull request #145 from ajstanley/7.x

Merged Nicks changes in - updating mimetypes, and killing ISLANDORACM