Try getting rid of the "upgrade-all" shenanigans.

Adding Travis fix, parallel to https://github.com/Islandora/islandora/pull/474