Specifying Ruby 2.1.0. Updated bundle.
Updated bundle.
Updated bundle. Reenabled ZeroMQ logging.
before merge upstream
fixed conflicts merging upstream