updated readme
Travis for Fedora 3.6.2
Merge pull request #20 from willtp87/7.x.travis

Travis for Fedora 3.6.2
fixed coding standards and updated READEME
fixed coding standards
Merge pull request #21 from philsogaDGI/7.x

Setup Travis and Tests
show navigator setting
merge conflict in readme
Merge pull request #22 from nhart/7.x

update readme and show navigator setting
Facilitate addition of new parameters.
Enabled Djatoka location to be configurable
added check url before setting value
fixed coding standards problems
fixed the last straggling coding standards problem
changed ant build to optionally output phpcs errors to console (with failonerror)
Merge pull request #24 from UCLALibrary/7.x

Enable Djatoka server base URL to be configurable
Merge branch '7.x-navigator-default' of github.com:adam-vessey/islandora_openseadragon into adam-vessey-7.x-navigator-default

Conflicts:
	islandora_openseadragon.module
Merge pull request #25 from UCLALibrary/ant-improvement

Changed ant build to, optionally, be more human friendly
Merge pull request #1 from Islandora/7.x

7.x update
adding fedora 3.7.0 to travis