Converted for use with the rails 3.1 asset pipeline, targetting v2.0