add conf for a possible pdf viewer
Merge branch '7.x' of git://github.com/Islandora/islandora_solution_pack_pdf into 7.x
Added travis, changed README to Markdown and fixed coding standards issues.
Implement the new derivative structure.
Fixed incorrect function documentation.
Add the pid to the dsm.
Merge pull request #54 from christianselig/7.x

Added travis, changed README to Markdown and fixed coding standards issues.
Merge branch '7.x-derivatives' of github.com:jordandukart/islandora_solution_pack_pdf into 7.x-derivatives

Conflicts:
	includes/derivatives.inc
Display the error message in the failure output.
Carry through changes of Islandora constants.
Merge pull request #56 from adam-vessey/7.x-constants

Carry through changes of Islandora constants.
Merge pull request #55 from jordandukart/7.x-derivatives

Implement the new derivative structure.
Prevent additional suffixes on filenames...

... which may throw off MIMEtype detection. Seems to be dependent on
OS, so Ubuntu didn't have the issue which CentOS did. Fun times!
merge conflicts
merge conflicts again
code clean up
Merge pull request #49 from nhart/7.x

7.x
Merge pull request #57 from adam-vessey/7.x-fix-tempnam-issue

Prevent additional suffixes on filenames...
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 #58 from ruebot/7.x

A wise @dbs once told me, "I noticed I screwed one thing up in Islandora...