Revert "Merge pull request #2373 from openscholar/2352-slideshow_scaling"

This reverts commit 383156ca7bdcad481b15446254ac69eb1eb1ff50, reversing
changes made to 77210294d741ad1dd23835b97b4894e3415ffbf0.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into SCHOLAR-3.x
Fixed media_gallery for drush make #2100

Some of my patches have been incorporated.  We're actually down to 3 patches on this one.
Using 2.x, but specified a revision so we don't get unexpected updates.

Also note that I rerolled one of the patches.  Instead of commenting out the taxonomy/collections shenanigans I just rmeoved them.
Merge pull request #2402 from openscholar/2100-media_gallery

2100 media gallery