README.md in amqp-0.7.0.pre vs README.md in amqp-0.7.0

@@ -43,12 +43,12 @@
 
 How to use AMQP gem with Ruby on Rails, Merb, Sinatra and other web frameworks
 ==============================================================================
 
 To use AMQP gem from web applications, you would need to have EventMachine reactor running.
-If you use [Thin](http://code.macournoyer.com/thin/), you are set: Thin uses EventMachine under
-the hook.
+If you use [Thin](http://code.macournoyer.com/thin/), you are all set: Thin uses EventMachine under
+the hood.
 
 With other web servers, you need to start EventMachine reactor in it's own thread like this:
 
     Thread.new { EM.run }
 
@@ -59,45 +59,54 @@
 In a Ruby on Rails app, probably the best place for this code is initializer
 (like config/initializers/amqp.rb). For Merb apps, it is config/init.rb. For
 Sinatra and pure Rack applications, place it next to other configuration
 code.
 
+If you want to integrate AMQP with Thin or another EventMachine-based software which already runs an event loop, you might want to use following code:
+
+    EM.next_tick { AMQP.connect(...) }
+
+So in case the reactor isn't running yet (which seems to be the case with Ruby on Rails 3.x and Thin combination), it won't fail, but wait when the reactor is started (see [issue #21](https://github.com/tmm1/amqp/issues/21)).
+
 Same separate thread technique can be used to make EventMachine play nicely with other
 libraries that would block current thread (like [File::Tail](http://rubygems.org/gems/file-tail)).
 
-AMQP gem mailing list
+Links
 ==============================
 
+* Jabber chat [[e-mail]](xmpp://[e-mail])
 * [AMQP gem mailing list](http://groups.google.com/group/ruby-amqp)
-* [AMQP gem at GitHub](http://github.com/tmm1/amqp)
+* [AMQP gem at GitHub](http://github.com/amqp-dev/amqp)
 * [AMQP gem at Gemcutter](http://rubygems.org/gems/amqp)
 
-Running specifications suite
+Contributions
 ============================
 
-To run the test suite make sure you have [bacon](http://gemcutter.org/gems/bacon) gem installed and run:
+All the dependencies are specified in <code>Gemfile</code>, so if you have [Bundler](http://gembundler.com), you can just run <code>bundle install</code>.
 
-    rake spec
+The <code>lib/amqp/spec.rb</code> file is generated automatically based on the [AMQP specification](http://www.amqp.org/confluence/display/AMQP/AMQP+Specification). To generate it:
 
-The lib/amqp/spec.rb file is generated automatically based on the [AMQP specification](http://www.amqp.org/confluence/display/AMQP/AMQP+Specification). To generate it:
-
     rake codegen
 
+For running specs, use <code>rake spec</code>.
+
 Credits and more information
 ============================
 
-(c) 2008—2010 [Aman Gupta](http://github.com/tmm1) (tmm1)
+* The Original Code is tmm1/amqp.
+* The Initial Developer of the Original Code is Aman Gupta.
+* Copyright (c) 2008 - 2010 [Aman Gupta](http://github.com/tmm1) (tmm1).
+* Contributions from Jakub Stastny are Copyright (c) 2011 VMware, Inc.
 
 Current maintainer: [Jakub Stastny](http://github.com/botanicus) aka [botanicus](http://twitter.com/botanicus).
 
 This project was inspired by [py-amqplib](http://barryp.org/software/py-amqplib/), [rabbitmq](http://rabbitmq.com), [qpid](http://qpid.apache.org/) and [rubbyt](http://github.com/rubbyt/rubbyt).
 Special thanks to Dmitriy Samovskiy, Ben Hood and Tony Garnock-Jones.
 
 AMQP brokers
 ------------
 
  * [RabbitMQ](http://rabbitmq.com) (Rabbit Technologies, Erlang/OTP, MPL)
- * [ZeroMQ](http://www.zeromq.org) (iMatix/FastMQ/Intel, C++, GPL3)
  * [OpenAMQ](http://openamq.org) (iMatix, C, GPL2)
  * [ActiveMQ](http://activemq.apache.org) (Apache Foundation, Java, Apache2)
 
 AMQP resources
 --------------