Upgrade eventmachine to 1.0
Update for Ruby 2.0
Merge branch 'master' into subtle