merge with master

Gemfile

@@ -1,10 +1,9 @@
 source 'http://rubygems.org'
-gem 'rails'
+gem 'rails','>=3.1.0'
 gem 'yajl-ruby', :require => 'yajl'
 
 gem 'bson_ext'
-gem 'carrierwave'
-gem 'carrierwave-mongoid', :require => 'carrierwave/mongoid'
+gem 'carrierwave', '0.5.4'
 gem 'ckeditor'
 gem 'devise'
 gem 'mini_magick'
@@ -13,7 +12,7 @@ gem 'sinatra'
 gem 'execjs'
 gem 'mongoid', :git => 'git://github.com/mongoid/mongoid.git', :ref => '7a915395db50e2bc6071a503a11530e644879e49'
 
-gem 'rake'
+gem 'rake','0.8.7'
 gem 'jquery-rails'
 
 gem 'sprockets'
@@ -21,7 +20,7 @@ gem 'sprockets'
 gem 'radius'
 
 # For linux
-gem 'therubyracer'
+# gem 'therubyracer'
 
 # Gems used only for assets and not required
 # in production environments by default.