Rename yield :scripts to :javascripts
Merge branch 'change_scripts_yield'