Updated .rvmrc file for Rails 4.0.1.
Updated Rails version.
Updated bundle. No ZeroMQ logging.
Fixed conflicts.