Merge branch 'master' into feature/kevin/edit_commentable_id

Gemfile

@@ -3,7 +3,7 @@ ruby "1.9.3"
 
 gem 'pry'
 gem 'pry-nav'
-gem 'debugger'
+# gem 'debugger'
 
 gem 'bundler'
 

Gemfile.lock

@@ -69,15 +69,7 @@ GEM
       bson (~> 1.6.4)
     builder (3.0.0)
     coderay (1.0.7)
-    columnize (0.3.6)
     dalli (2.1.0)
-    debugger (1.2.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.3)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.3)
     delayed_job (3.0.3)
       activesupport (~> 3.0)
     diff-lcs (1.1.3)
@@ -169,7 +161,6 @@ DEPENDENCIES
   bson_ext
   bundler
   dalli
-  debugger
   delayed_job
   delayed_job_mongoid!
   faker

config/mongoid.yml

@@ -12,10 +12,23 @@ test:
       hosts:
         - localhost:27017
 
+#production:
+#  sessions:
+#    default:
+#      uri: <%= ENV['MONGOHQ_URL'] %>
+
 production:
   sessions:
     default:
-      uri: <%= ENV['MONGOHQ_URL'] %>
+      hosts:
+        - hurley.member0.mongohq.com:10000
+      username: <%= ENV['MONGOHQ_USER'] %>
+      password: <%= ENV['MONGOHQ_PASS'] %>
+      database: app6929933
+      options:
+        skip_version_check: true
+        safe: true
+        consistency: strong
 
 staging:
   sessions:
@@ -25,7 +38,15 @@ staging:
 loadtest:
   sessions:
     default:
-      uri: <%= ENV['MONGOHQ_URL'] %>
+      hosts:
+        - sayid.member0.mongohq.com:10007
+        - sayid.member1.mongohq.com:10007
+      username: <%= ENV['MONGOHQ_USER'] %>
+      password: <%= ENV['MONGOHQ_PASS'] %>
+      database: app7276251
+      options:
+        skip_version_check: true
+        safe: true
 
 defaults: &defaults
   use_utc: false