pulled in all of max's changes from yesterday to 187

Gemfile

@@ -11,9 +11,9 @@ gem 'roxml', :git => "git://github.com/Empact/roxml.git"
 
 
 #mai crazy async stuff
-gem 'em-synchrony',   :git => 'git://github.com/igrigorik/em-synchrony.git',    :require => 'em-synchrony/em-http'
+#gem 'em-synchrony',   :git => 'git://github.com/igrigorik/em-synchrony.git',    :require => 'em-synchrony/em-http'
 gem 'em-http-request',:git => 'git://github.com/igrigorik/em-http-request.git', :require => 'em-http'
-gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
+#gem 'rack-fiber_pool', :require => 'rack/fiber_pool'
 gem 'addressable', :require => "addressable/uri"
 gem 'em-websocket'
 gem 'thin'

app/models/post.rb

 class Post 
-  require_relative '../../lib/common'
+  require 'lib/common'
   include ApplicationHelper 
   
   # XML accessors must always preceed mongo field tags

config.ru

 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
-use Rack::FiberPool
+#use Rack::FiberPool
 run Diaspora::Application