Gemfile: upgraded eventmachine.
Merge branch 'master' into upgrade2014