Merge pull request #2 from Islandora/7.x

update 7.x
update build xml for jenkins
Merge pull request #57 from qadan/7.x

update build xml for jenkins
switch up mime depending on ds sent to viewer
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_video into 7.x
Merge pull request #59 from nhart/7.x

switch up mime depending on ds sent to viewer