add conf for a possible pdf viewer
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_pdf into 7.x
merge conflicts
merge conflicts again
code clean up
Merge pull request #49 from nhart/7.x

7.x