Bug - path incorrect in init.rb

app/configuration.rb

@@ -25,7 +25,7 @@ class ClassMappings
       # Aryk: I cleaned up how the class variables are called here. It doesnt matter if you use class variables or instance variables on the class level. Check out this simple tutorial
       # - http://sporkmonger.com/2007/2/19/instance-variables-class-variables-and-inheritance-in-ruby      
 
-      class << self           
+      class << self
         include RubyAMF::App
         include RubyAMF::Exceptions 
 
@@ -61,7 +61,7 @@ def register(mapping)  #register a value object map
           rescue ActiveRecord::StatementInvalid => e
             # This error occurs during migrations, since the AR constructed above will check its columns, but the table won't exist yet.
             # We'll ignore the error if we're migrating.
-            raise unless ARGV.include?("migrate") or ARGV.include?("db:migrate")
+            raise unless ARGV.include?("migrate") or ARGV.include?("db:migrate") or ARGV.include?("rollback") or ARGV.include?("db:rollback")
           end
         end
 

init.rb

@@ -1,4 +1,4 @@
-$:.unshift(File.expand_path(RAILS_ROOT) + '/vendor/plugins/rubyamf/')
+$:.unshift(File.dirname(__FILE__))
 
 #utils must be first
 require 'util/string'

util/string.rb

@@ -3,7 +3,7 @@ class String
   def to_snake! # no one should change these unless they can benchmark and prove their way is faster. =)
     @cached_snake_strings ||= {}
     @cached_snake_strings[self] ||= (
-      while x = index(/([a-z\d])([A-Z])/) # unfortunately have to use regex for this one
+      while x = index(/([a-z\d])([A-Z\d])/) # unfortunately have to use regex for this one
         y=x+1
         self[x..y] = self[x..x]+"_"+self[y..y].downcase
       end