correct schema.org integration
Merge pull request #47 from ruebot/7.x-correct-schema.org

correct schema.org integration
Added ffmpeg install to travis through a script now found in tests/scripts. README is now in Markdown as well and links to travis build status.
Merge pull request #48 from christianselig/7.x

Added ffmpeg install to travis through a script now found in tests/scrip...
Changes to conform new derivative structure.
Carry through changes of Islandora constants.
Merge pull request #50 from adam-vessey/7.x-constants

Carry through changes of Islandora constants.
Merge branch '7.x' of github.com:Islandora/islandora_solution_pack_video into 7.x-derivatives
Fix strict checking.
Merge pull request #49 from jordandukart/7.x-derivatives

Changes to conform new derivative structure.
A wise @dbs once told me, "I noticed I screwed one thing up in Islandora; the vocab="http://schema.org" is missing the trailing slash"
Merge pull request #51 from ruebot/7.x

A wise @dbs once told me, "I noticed I screwed one thing up in Islandora...
fix MKV datastream mimetpye and delete m4v because it is not exist in mim detect
add mpv to extension list, caz ffmpeg can convert it
Update extensions allowed for upload, DS-COMPOSITE-MODEL allowed extensions.
Merge pull request #1 from jordandukart/7.x-fix-video-mimetype

Update extensions allowed for upload, DS-COMPOSITE-MODEL allowed extensi...
Merge pull request #52 from yqjiang/7.x-fix-video-mimetype

fix MKV datastream mimetpye and delete m4v because it is not exist in mi...
conflict resolution