include islandora mimetypes in drupal mimetype mappings
coder review
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x
code review changes
Merge pull request #347 from nhart/7.x

7.x