bundler needs help. removing gemspec helepr for now

Gemfile

@@ -2,7 +2,28 @@
 source :rubygems
 
 # add in all the runtime dependencies
-gemspec
+
+gem "rails", ">= 3.0.0"
+gem "locomotive_liquid", ">= 2.1.3"
+gem "bson_ext", ">= 1.0.8"
+gem "mongoid", :git => 'http://github.com/mongoid/mongoid.git'
+gem "mongoid_acts_as_tree", "= 0.1.5"
+gem "mongo_session_store", "= 2.0.0.pre"
+gem "warden"
+gem "devise", "= 1.1.2"
+gem "haml", "= 3.0.18"
+gem "rmagick", "= 2.12.2"
+gem "aws"
+gem "mimetype-fu"
+gem "formtastic", ">= 1.1.0"
+gem "carrierwave", ">= 0.5.0"
+gem "actionmailer-with-request"
+gem "heroku"
+gem "httparty", ">= 0.6.1"
+gem "RedCloth"
+gem "inherited_resources", ">= 1.1.2"
+gem "custom_fields"
+
 
 # The rest of the dependencies are for use when in the locomotive dev environment
 

Gemfile.lock

@@ -15,30 +15,15 @@ GIT
       rspec (>= 1.3)
       yard
 
-PATH
-  remote: .
+GIT
+  remote: http://github.com/mongoid/mongoid.git
+  revision: bc177989f4c4020ec7b16c8ce7cbdea51eba4034
   specs:
-    locomotive_cms (0.0.3.3)
-      RedCloth
-      actionmailer-with-request
-      aws
-      bson_ext (>= 1.0.8)
-      carrierwave (>= 0.5.0)
-      custom_fields
-      devise (= 1.1.2)
-      formtastic (>= 1.1.0)
-      haml (= 3.0.18)
-      heroku
-      httparty (>= 0.6.1)
-      inherited_resources (>= 1.1.2)
-      locomotive_liquid (>= 2.1.3)
-      mimetype-fu
-      mongo_session_store (= 2.0.0.pre)
-      mongoid (>= 2.0.0.beta.18)
-      mongoid_acts_as_tree (= 0.1.5)
-      rails (>= 3.0.0)
-      rmagick (= 2.12.2)
-      warden
+    mongoid (2.0.0.beta.18)
+      activemodel (~> 3.0)
+      mongo (= 1.0.9)
+      tzinfo (~> 0.3.22)
+      will_paginate (~> 3.0.pre)
 
 GEM
   remote: http://rubygems.org/
@@ -158,12 +143,6 @@ GEM
       bson (>= 1.0.5)
     mongo_session_store (2.0.0.pre)
       actionpack (~> 3.0)
-    mongoid (2.0.0.beta11)
-      activemodel (~> 3.0.0.beta)
-      bson (~> 1.0.4)
-      mongo (~> 1.0.5)
-      tzinfo (~> 0.3.22)
-      will_paginate (~> 3.0.pre)
     mongoid_acts_as_tree (0.1.5)
       bson (>= 0.20.1)
       mongoid (<= 2.0.0)
@@ -259,12 +238,11 @@ DEPENDENCIES
   httparty (>= 0.6.1)
   inherited_resources (>= 1.1.2)
   launchy
-  locomotive_cms!
   locomotive_liquid (>= 2.1.3)
   mimetype-fu
   mocha!
   mongo_session_store (= 2.0.0.pre)
-  mongoid (>= 2.0.0.beta.18)
+  mongoid!
   mongoid_acts_as_tree (= 0.1.5)
   mongrel
   pickle!

lib/locomotive/carrierwave.rb

@@ -3,4 +3,6 @@ require 'locomotive/carrierwave/base'
 require 'locomotive/carrierwave/patches'
 
 # register missing mime types
-EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'
+
+# what does this do?
+# EXTENSIONS[:eot] = 'application/vnd.ms-fontobject'