Attempt to fix travis
Merge branch '7.x' of git://github.com/Islandora/islandora into 7.x-fix-travis

Conflicts:
	includes/ingest.form.inc
Another attempt to appease the travis gods.
Yet another attempt to appease the travis gods.
Merge pull request #340 from jonathangreen/7.x-fix-travis

Attempt to fix travis