merge

Gemfile

@@ -25,13 +25,10 @@ gem "mongo_session_store-rails3"
 gem 'mysql2'
 gem 'nokogiri'
 
-gem 'pry', :group => :development
-gem 'pry-debugger', :group => :development
-
 gem 'radius'
 gem 'rake'
 # gem 'remotipart'
-gem 'resque' # background jobs
+gem 'resque', :require => 'resque/server' # background jobs
 gem 'resque-scheduler' # job scheduling
 gem 'resque-restriction'
 #gem 'rb-readline'
@@ -84,7 +81,7 @@ group :test, :development do
   gem "simplecov"
   gem "delorean"
   gem "watchr"
-	gem "spork"
+  gem "spork"
   # gem "capybara"
   # gem 'yard'
   # gem "bluecloth"