Including options for devs using rails asset pipeline.
Fixing merge issues