diff --git a/Gemfile b/Gemfile
index 8d506a257..d4147ede1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -37,7 +37,6 @@ gem 'eventmachine', '1.0.0'
 gem 'amqp', '0.9.8'
 gem 'logging-rails', :require => 'logging/rails'
 gem 'tire', '0.5.1'
-gem 'rb-readline', '0.4.2'
 gem 'omniauth', '1.1.1'
 gem 'omniauth-facebook', '1.4.1'
 gem 'fb_graph', '2.5.9'
@@ -79,6 +78,10 @@ group :test, :cucumber do
   # gem 'growl', '1.0.3'
 end
 
+group :production do
+  gem 'unicorn'
+end
+
 group :package do
    gem 'fpm'
 end
diff --git a/build b/build
index 5843ec89f..e4f453426 100755
--- a/build
+++ b/build
@@ -10,6 +10,7 @@ mkdir $DIR/target
 mkdir $DIR/target/deb
  
 # put all dependencies into vendor/bundle
+#rm -rf vendor/bundle
 bundle install --path vendor/bundle
 bundle update
 
diff --git a/config/initializers/eventmachine.rb b/config/initializers/eventmachine.rb
index fc93d5352..e69884b6f 100644
--- a/config/initializers/eventmachine.rb
+++ b/config/initializers/eventmachine.rb
@@ -51,8 +51,10 @@ module JamWebEventMachine
         }
         die_gracefully_on_signal
       end
+    elsif defined?(Unicorn)
+      Rails.logger.debug("Unicorn detected--do nothing at initializer phase")
     else
-      Rails.logger.debug("PhusionPassenger not detected")
+      Rails.logger.debug("Development environment detected")
       Thread.abort_on_exception = true
 
       # create a new thread separate from the Rails main thread that EventMachine can run on
diff --git a/config/unicorn.rb b/config/unicorn.rb
new file mode 100644
index 000000000..cd85380f7
--- /dev/null
+++ b/config/unicorn.rb
@@ -0,0 +1,105 @@
+# Sample verbose configuration file for Unicorn (not Rack)
+#
+# This configuration file documents many features of Unicorn
+# that may not be needed for some applications. See
+# http://unicorn.bogomips.org/examples/unicorn.conf.minimal.rb
+# for a much simpler configuration file.
+#
+# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
+# documentation.
+
+# Use at least one worker per core if you're on a dedicated server,
+# more will usually help for _short_ waits on databases/caches.
+worker_processes 4
+
+# Since Unicorn is never exposed to outside clients, it does not need to
+# run on the standard HTTP port (80), there is no reason to start Unicorn
+# as root unless it's from system init scripts.
+# If running the master process as root and the workers as an unprivileged
+# user, do this to switch euid/egid in the workers (also chowns logs):
+user "jam-web", "jam-web"
+
+# Help ensure your application will always spawn in the symlinked
+# "current" directory that Capistrano sets up.
+working_directory "/var/lib/jam-web" # available in 0.94.0+
+
+# listen on both a Unix domain socket and a TCP port,
+# we use a shorter backlog for quicker failover when busy
+listen "/tmp/.sock", :backlog => 64
+listen 3100, :tcp_nopush => true
+
+# nuke workers after 30 seconds instead of 60 seconds (the default)
+timeout 30
+
+# feel free to point this anywhere accessible on the filesystem
+pid "/var/run/jam-web.pid"
+
+# By default, the Unicorn logger will write to stderr.
+# Additionally, ome applications/frameworks log to stderr or stdout,
+# so prevent them from going to /dev/null when daemonized here:
+stderr_path "/var/lib/jam-web/log/unicorn.stderr.log"
+stdout_path "/var/lib/jam-web/log/unicorn.stdout.log"
+
+# combine Ruby 2.0.0dev or REE with "preload_app true" for memory savings
+# http://rubyenterpriseedition.com/faq.html#adapt_apps_for_cow
+preload_app true
+GC.respond_to?(:copy_on_write_friendly=) and
+  GC.copy_on_write_friendly = true
+
+# Enable this flag to have unicorn test client connections by writing the
+# beginning of the HTTP headers before calling the application.  This
+# prevents calling the application for connections that have disconnected
+# while queued.  This is only guaranteed to detect clients on the same
+# host unicorn runs on, and unlikely to detect disconnects even on a
+# fast LAN.
+check_client_connection false
+
+before_fork do |server, worker|
+  # the following is highly recomended for Rails + "preload_app true"
+  # as there's no need for the master process to hold a connection
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.connection.disconnect!
+ 
+  # The following is only recommended for memory/DB-constrained
+  # installations.  It is not needed if your system can house
+  # twice as many worker_processes as you have configured.
+  #
+  # # This allows a new master process to incrementally
+  # # phase out the old master process with SIGTTOU to avoid a
+  # # thundering herd (especially in the "preload_app false" case)
+  # # when doing a transparent upgrade.  The last worker spawned
+  # # will then kill off the old master process with a SIGQUIT.
+  # old_pid = "#{server.config[:pid]}.oldbin"
+  # if old_pid != server.pid
+  #   begin
+  #     sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
+  #     Process.kill(sig, File.read(old_pid).to_i)
+  #   rescue Errno::ENOENT, Errno::ESRCH
+  #   end
+  # end
+  #
+  # Throttle the master from forking too quickly by sleeping.  Due
+  # to the implementation of standard Unix signal handlers, this
+  # helps (but does not completely) prevent identical, repeated signals
+  # from being lost when the receiving process is busy.
+  # sleep 1
+end
+
+after_fork do |server, worker|
+  # per-process listener ports for debugging/admin/migrations
+  # addr = "127.0.0.1:#{9293 + worker.nr}"
+  # server.listen(addr, :tries => -1, :delay => 5, :tcp_nopush => true)
+
+  # the following is *required* for Rails + "preload_app true",
+  defined?(ActiveRecord::Base) and
+    ActiveRecord::Base.establish_connection
+
+  Thread.new do
+    JamWebEventMachine.run_em
+  end
+  # if preload_app is true, then you may also want to check and
+  # restart any other shared sockets/descriptors such as Memcached,
+  # and Redis.  TokyoCabinet file handles are safe to reuse
+  # between any number of forked children (assuming your kernel
+  # correctly implements pread()/pwrite() system calls)
+end
diff --git a/script/package/jam-web.conf b/script/package/jam-web.conf
index 039e7ba24..1c5a347ec 100755
--- a/script/package/jam-web.conf
+++ b/script/package/jam-web.conf
@@ -4,4 +4,13 @@ start on startup
 start on runlevel [2345]
 stop on runlevel [016]
 
-exec start-stop-daemon --start --chuid jam-web --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh
+
+#expect daemon
+#expect fork
+env BUILD_NUMBER=1
+
+#chdir /var/lib/jam-web
+
+#exec /usr/local/rbenv/shims/bundle exec unicorn_rails -E production -c config/unicorn.rb >> /tmp/loggie
+#exec /var/lib/jam-web/script/package/upstart-run.sh
+exec start-stop-daemon --start --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh 
diff --git a/script/package/upstart-run.sh b/script/package/upstart-run.sh
index 5a93b6305..e4107e2b3 100755
--- a/script/package/upstart-run.sh
+++ b/script/package/upstart-run.sh
@@ -10,5 +10,5 @@ if [ -e "$CONFIG_FILE" ]; then
 	. "$CONFIG_FILE"
 fi
 
-BUILD_NUMBER=$BUILD_NUMBER bundle exec rails s -p $PORT -e production
+BUILD_NUMBER=$BUILD_NUMBER exec bundle exec unicorn_rails -p $PORT -E production -c config/unicorn.rb # -D
 #BUILD_NUMBER=$BUILD_NUMBER /usr/local/rbenv/shims/bundle exec rails s -p $PORT