bundle update

updated Gemfile.lock - later version of eventmachine is required on
windows (0.12.10 does not compile).
Merge remote-tracking branch 'origin/bundle-update'