Merge branch 'master' of https://github.com/Rulingcom/orbit

Gemfile

@@ -2,7 +2,6 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.0.6'
 gem 'yajl-ruby', :require => 'yajl'
-gem 'nokogiri'
 
 gem 'bson_ext'
 gem 'carrierwave'

Gemfile.lock

@@ -29,7 +29,7 @@ GEM
       activesupport (= 3.0.6)
     activesupport (3.0.6)
     arel (2.0.10)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (2.1.4-x86-mingw32)
     bson (1.3.1)
     bson_ext (1.3.1)
     builder (2.1.2)
@@ -67,7 +67,6 @@ GEM
       mongo (~> 1.2)
       tzinfo (~> 0.3.22)
       will_paginate (~> 3.0.pre)
-    nokogiri (1.4.4)
     orm_adapter (0.0.5)
     polyglot (0.3.1)
     rack (1.2.3)
@@ -116,7 +115,7 @@ GEM
     yajl-ruby (0.8.2)
 
 PLATFORMS
-  ruby
+  x86-mingw32
 
 DEPENDENCIES
   bson_ext
@@ -127,7 +126,6 @@ DEPENDENCIES
   factory_girl_rails
   mini_magick
   mongoid (= 2.0.0)
-  nokogiri
   rails (= 3.0.6)
   rake (= 0.8.7)
   rcov

config/environment.rb

@@ -1,5 +1,7 @@
 # Load the rails application
 require File.expand_path('../application', __FILE__)
+require 'yaml'
+YAML::ENGINE.yamler = 'syck'
 
 # Initialize the rails application
 PrototypeR4::Application.initialize!