Add support for saved options
Upgrade sprockets and sprockets-helpers