Fix bugs after merge

Gemfile

@@ -12,7 +12,6 @@ gem 'exception_notification' # Send error trace
 gem 'execjs'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
-gem "pry", "~> 0.9.10"
 gem 'kaminari', :git => 'git://github.com/amatsuda/kaminari.git'
 
 # gem "memcached", "~> 1.4.3"
@@ -27,7 +26,7 @@ gem 'nokogiri'
 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'