Touching up code to work with 2.4.2 and migrating to asset-pipeline