Prefer the subtler `js-olay-scale-up` as a default
Reorder CSS to match transition preference
Merge branch 'master' into gh-pages