Updated .rvmrc file for Rails 4.0.1.
Updated bundle.
Updated bundle.
Fixed conflict.