#6565: Rearrange js so sortables are always init before we do things.
Merge pull request #6566 from openscholar/6565-columns_widget_js

Rearrange js so sortables are always init before we do things.
Merge
Fix tests that Dan Broke
Merge branch 'SCHOLAR-3.x' into 6509