diff --git a/app/controllers/admin/accessories_controller.rb b/app/controllers/admin/accessories_controller.rb
index 3e1a2bf..c1d40e6 100644
--- a/app/controllers/admin/accessories_controller.rb
+++ b/app/controllers/admin/accessories_controller.rb
@@ -7,49 +7,49 @@ def edit
       @product_accessories = @product.product_accessories
       @categories = Category.root.all_children
     end
-    
+
     def show
       @product = Product.find(params[:product_id])
       @category = Category.find(params[:category_id])
       @products = @category.products
     end
-    
+
     def create
       @product = Product.find(params[:product_id])
       accessory = Product.find(params[:accessory_id])
       @product.accessories << accessory
       @product_accessories = @product.product_accessories
       respond_to do |format|
-        format.js { 
+        format.js {
           render :partial => 'accessories'
         }
       end
-      
+
     end
-    
+
     def update
       @product = Product.find(params[:product_id])
       @product_accessory = ProductAccessory.find(params[:id])
       @product_accessory.update_attributes(params[:product_accessory])
       @product_accessories = @product.product_accessories
       respond_to do |format|
-        format.js { 
+        format.js {
           render :partial => 'accessories'
         }
       end
     end
-    
+
     def destroy
       @product = Product.find(params[:product_id])
       @product_accessory = ProductAccessory.find(params[:id])
       @product_accessory.destroy
       @product_accessories = @product.product_accessories
        respond_to do |format|
-          format.js { 
+          format.js {
             render :partial => 'accessories'
           }
         end
     end
-    
+
   end
 end
diff --git a/app/controllers/admin/authorizations_controller.rb b/app/controllers/admin/authorizations_controller.rb
index b9aec45..f5bd37e 100644
--- a/app/controllers/admin/authorizations_controller.rb
+++ b/app/controllers/admin/authorizations_controller.rb
@@ -1,13 +1,13 @@
 module Admin
 
 class AuthorizationsController < ApplicationController
-  
+
   def update
     @order = Order.find(params[:id])
-    # set amount if exists, else use order total 
+    # set amount if exists, else use order total
     amount = params[:post_authorize_amount].to_d unless params[:post_authorize_amount].blank?
     amount ||= @order.total_in_cents
-    
+
     if @order.authorized?
       @order.capture_payment({:amount => amount})
     else
@@ -17,8 +17,8 @@ def update
 
     render :partial => 'admin/orders/order_transactions'
   end
-  
-  
+
+
 end
 
 
diff --git a/app/controllers/admin/categories_controller.rb b/app/controllers/admin/categories_controller.rb
index 7a6a492..3f48c0f 100644
--- a/app/controllers/admin/categories_controller.rb
+++ b/app/controllers/admin/categories_controller.rb
@@ -12,7 +12,7 @@ def index
     def new
       @category = Category.new
     end
-    
+
     def create
       @category = Category.new(params[:category])
       respond_to do |format|
@@ -27,11 +27,11 @@ def create
         end
       end
     end
-    
+
     def edit
       @category = Category.find(params[:id])
     end
-    
+
     def update
       @category = Category.find(params[:id])
 
@@ -42,10 +42,10 @@ def update
           flash[:notice] = 'Category was successfully updated.'
         end
         format.html { render :action => "edit" }
-        
+
       end
     end
-    
+
    def show
       @category = Category.find(params[:id])
 
@@ -58,12 +58,12 @@ def show
    def destroy
       category = Category.find(params[:id])
       category.destroy
-      
+
       respond_to do |format|
         format.html { redirect_to(admin_categories_url) }
       end
     end
-    
+
     def reorder
       category = Category.find(params[:id])
       category.reorder(params)
diff --git a/app/controllers/admin/category_icon_hovers_controller.rb b/app/controllers/admin/category_icon_hovers_controller.rb
index aa74a23..6bda6f9 100644
--- a/app/controllers/admin/category_icon_hovers_controller.rb
+++ b/app/controllers/admin/category_icon_hovers_controller.rb
@@ -1,20 +1,20 @@
 class Admin::CategoryIconHoversController < ApplicationController
   layout "admin"
   require_role "admin"
-  
-  def create 
+
+  def create
     category_icon = CategoryIcon.find(params[:category_icon_id])
     category_icon.create_category_icon_hover(params[:category_icon_hover])
-    render :partial => '/admin/categories/icon_hover', 
+    render :partial => '/admin/categories/icon_hover',
            :locals => { :icon => category_icon }
   end
-  
+
   def destroy
     category_icon = CategoryIcon.find(params[:category_icon_id])
     category_icon_hover = CategoryIconHover.find(params[:id])
     category_icon_hover.destroy
-    render :partial => '/admin/categories/icon_hover', 
+    render :partial => '/admin/categories/icon_hover',
            :locals => { :icon => category_icon }
-  end   
+  end
 
 end
diff --git a/app/controllers/admin/category_icons_controller.rb b/app/controllers/admin/category_icons_controller.rb
index eb2df65..b8c637c 100644
--- a/app/controllers/admin/category_icons_controller.rb
+++ b/app/controllers/admin/category_icons_controller.rb
@@ -1,21 +1,21 @@
 class Admin::CategoryIconsController < ApplicationController
   layout "admin"
   require_role "admin"
-  
-  def create 
+
+  def create
     category = Category.find(params[:category_id])
     category.create_category_icon(params[:category_icon])
-    
-    render :partial => '/admin/categories/icon', 
+
+    render :partial => '/admin/categories/icon',
            :locals => { :category => category }
   end
-  
+
   def destroy
     category = Category.find(params[:category_id])
     category_icon = CategoryIcon.find(params[:id])
     category_icon.destroy
-    render :partial => '/admin/categories/icon', 
+    render :partial => '/admin/categories/icon',
            :locals => { :category => category }
-  end   
+  end
 
 end
diff --git a/app/controllers/admin/category_images_controller.rb b/app/controllers/admin/category_images_controller.rb
index 8eb267b..290b898 100644
--- a/app/controllers/admin/category_images_controller.rb
+++ b/app/controllers/admin/category_images_controller.rb
@@ -1,21 +1,21 @@
 class Admin::CategoryImagesController < ApplicationController
   layout "admin"
   require_role "admin"
-  
-  def create 
+
+  def create
     category = Category.find(params[:category_id])
     category.category_images.create(params[:category_image])
     category = Category.find(params[:category_id])
-    render :partial => '/admin/categories/image_list', 
+    render :partial => '/admin/categories/image_list',
            :locals => { :category => category }
   end
-  
+
   def destroy
     category = Category.find(params[:category_id])
     category_image = CategoryImage.find(params[:id])
     category_image.destroy
-    render :partial => '/admin/categories/image_list', 
+    render :partial => '/admin/categories/image_list',
            :locals => { :category => category }
-  end   
+  end
 
 end
diff --git a/app/controllers/admin/configurations_controller.rb b/app/controllers/admin/configurations_controller.rb
index 56ff1e3..80880c8 100644
--- a/app/controllers/admin/configurations_controller.rb
+++ b/app/controllers/admin/configurations_controller.rb
@@ -3,22 +3,22 @@ module Admin
   class ConfigurationsController < ApplicationController
     layout "admin"
     require_role "admin"
-  
+
     def index
       @configuration = Configuration.first || Configuration.create
-      
+
       respond_to do |format|
         format.html # index.rhtml
         format.xml  { render :xml => @optimization.to_xml }
       end
     end
-  
+
     def edit
       @configuration = Configuration.first || Configuration.create
     end
-  
+
     def update
-      @configuration = Configuration.first 
+      @configuration = Configuration.first
       respond_to do |format|
         if @configuration.update_attributes(params[:configuration])
           flash[:notice] = 'configuration was successfully updated.'
@@ -31,6 +31,6 @@ def update
         end
       end
     end
-  
+
   end
 end
\ No newline at end of file
diff --git a/app/controllers/admin/flat_rate_shipping_controller.rb b/app/controllers/admin/flat_rate_shipping_controller.rb
index 4c5e42f..b6d2fe2 100644
--- a/app/controllers/admin/flat_rate_shipping_controller.rb
+++ b/app/controllers/admin/flat_rate_shipping_controller.rb
@@ -1,12 +1,12 @@
 module Admin
-  
-  
+
+
 class FlatRateShippingController < ApplicationController
     layout 'admin'
     require_role "admin"
-  
+
     def index
-      
+
     end
 
 
diff --git a/app/controllers/admin/optimizations_controller.rb b/app/controllers/admin/optimizations_controller.rb
index bcff03f..71f9868 100644
--- a/app/controllers/admin/optimizations_controller.rb
+++ b/app/controllers/admin/optimizations_controller.rb
@@ -3,20 +3,20 @@ module Admin
   class OptimizationsController < ApplicationController
     layout "admin"
     require_role "admin"
-  
+
     def index
       @optimization = Optimization.first || Optimization.create
-      
+
       respond_to do |format|
         format.html # index.rhtml
         format.xml  { render :xml => @optimization.to_xml }
       end
     end
-  
+
     def edit
-      @optimization = Optimization.first 
+      @optimization = Optimization.first
     end
-  
+
     def update
       @optimization = Optimization.first
       respond_to do |format|
@@ -31,6 +31,6 @@ def update
         end
       end
     end
-  
+
   end
 end
\ No newline at end of file
diff --git a/app/controllers/admin/out_of_stock_options_controller.rb b/app/controllers/admin/out_of_stock_options_controller.rb
index b9207be..cbe8bdf 100644
--- a/app/controllers/admin/out_of_stock_options_controller.rb
+++ b/app/controllers/admin/out_of_stock_options_controller.rb
@@ -2,13 +2,13 @@ module Admin
 
   class OutOfStockOptionsController < ApplicationController
     require_role "admin"
-    
+
     # add a new out of stock option
     def create
       puts params.to_yaml
       product = Product.find(params[:product_id])
       out_of_stock_option = OutOfStockOption.new
-      
+
       # adds out of stock selections
       selections = params[:selections]
       unless product.out_of_stock?(selections)
@@ -22,21 +22,21 @@ def create
             out_of_stock_option.out_of_stock_option_selections << out_of_stock_selection
           end
         end
-      
+
         product.out_of_stock_options << out_of_stock_option
       end
-      
+
       render :partial => 'admin/products/out_of_stock_options/out_of_stock_options',
              :locals => { :out_of_stock_options => product.out_of_stock_options }
     end
-    
-    
+
+
     # delete a out of stock option
     def destroy
-      product = Product.find(params[:product_id])     
+      product = Product.find(params[:product_id])
       out_of_stock_option = OutOfStockOption.find(params[:id])
       product.out_of_stock_options.delete(out_of_stock_option)
-      
+
       render :partial => 'admin/products/out_of_stock_options/out_of_stock_options',
              :locals => { :out_of_stock_options => product.out_of_stock_options }
     end
diff --git a/app/controllers/admin/product_options_controller.rb b/app/controllers/admin/product_options_controller.rb
index 389a64e..f9eea4d 100644
--- a/app/controllers/admin/product_options_controller.rb
+++ b/app/controllers/admin/product_options_controller.rb
@@ -4,11 +4,11 @@ module Admin
 
   class ProductOptionsController < ApplicationController
     require_role "admin"
-  
+
     # TODO: move option selection methods to nested ProductOptionSelectionController
-    
+
     # add a new product selection to the product option
-    def add_option_selection      
+    def add_option_selection
       @product = Product.find(params[:product_id])
       @product_option = ProductOption.find(params[:product_option_id])
       name = params[:product_option_selection][:name]
@@ -22,34 +22,34 @@ def add_option_selection
       @product_option.product_option_selections << @selection
 
     end
-    
+
     # add an image to the product option selection
     def add_option_selection_image
       image = ProductOptionSelectionImage.new(params[:option_selection_image])
       option_selection = ProductOptionSelection.find(params[:id])
       option_selection.images << image
       responds_to_parent do
-        render :update do |page| 
-          page[:image_list].replace_html :partial => '/admin/product_options/option_selection_image_list', 
+        render :update do |page|
+          page[:image_list].replace_html :partial => '/admin/product_options/option_selection_image_list',
                                          :locals => { :option_selection => option_selection }
         end
       end
     end
-    
+
     # remove an image from the product option selection
     def remove_option_selection_image
       option_selection = ProductOptionSelection.find(params[:id])
       image = ProductOptionSelectionImage.find(params[:image_id])
-      option_selection.images.delete(image)  
+      option_selection.images.delete(image)
 
       respond_to do |format|
-        format.js { 
-          render :partial => '/admin/product_options/option_selection_image_list', 
+        format.js {
+          render :partial => '/admin/product_options/option_selection_image_list',
                  :locals => { :option_selection => option_selection }
         }
-      end  
+      end
     end
-    
+
     # edit the option selection
     def edit_option_selection
       @product = Product.find(params[:product_id])
@@ -65,48 +65,48 @@ def edit_option_selection
         @option_selection.images  << image
       end
     end
-    
+
     # remove product selection to the product option
-    def remove_option_selection      
+    def remove_option_selection
       @product = Product.find(params[:product_id])
       @product_option = ProductOption.find(params[:product_option_id])
       @selection = ProductOptionSelection.find(params[:selection_id])
-      
+
       @product_option.product_option_selections.delete(@selection)
     end
-    
+
     # add the existing product option to the product
     def apply_option_to_product
       @product = Product.find(params[:product_id])
-  
+
       @product_option = ProductOption.find(params[:product_option][:id])
       @product_option.update_attributes(params[:product_option])
 
-      product_option_instance = ProductOptionInstance.new(:product => @product, 
+      product_option_instance = ProductOptionInstance.new(:product => @product,
                                                           :product_option => @product_option)
-                                                          
+
       product_option_instance.save
 
       @available_options = ProductOption.find(:all, :order => 'name')
     end
-    
+
     # add a new product option
     def create
       @product = Product.find(params[:product_id])
-  
+
       @product_option = ProductOption.new(params[:product_option])
-      product_option_instance = ProductOptionInstance.new(:product => @product, 
+      product_option_instance = ProductOptionInstance.new(:product => @product,
                                                           :product_option => @product_option)
       @product_option_selection = ProductOptionSelection.new
       @available_options = ProductOption.find(:all, :order => 'name')
-    
+
       if product_option_instance.save
         flash[:notice] = 'New Product Option Saved'
-      else 
+      else
         flash[:notice] = 'Product Option Not Saved'
       end
     end
-    
+
     # edit a current product option
     def edit
       @product = Product.find(params[:id])
@@ -117,25 +117,25 @@ def edit
       end
       @product_option = ProductOption.find(product_option_id)
     end
-    
-    
+
+
     # update a current product option
     def update
       @product_option = ProductOption.find(params[:product_option][:id])
       @product = Product.find(params[:product_id])
       @product_option.update_attributes(params[:product_option])
-      
+
       @available_options = ProductOption.find(:all, :order => 'name')
     end
-    
-    
+
+
     # delete a product option
     def destroy
-      @product = Product.find(params[:product_id])     
+      @product = Product.find(params[:product_id])
       @product_option = ProductOption.find(params[:id])
       @product.product_options.delete(@product_option)
-      
-      @available_options = ProductOption.find(:all, :order => 'name') 
+
+      @available_options = ProductOption.find(:all, :order => 'name')
     end
 
   end
diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb
index 0adedf9..ad2eaf5 100644
--- a/app/controllers/admin/products_controller.rb
+++ b/app/controllers/admin/products_controller.rb
@@ -4,42 +4,42 @@ module Admin
 class ProductsController < ApplicationController
   layout "admin"
   require_role "admin"
-  
+
   # add a product to the category
   def add_to_category
     @product = Product.find(params[:id])
     @category = Category.find(params[:category_select])
     @product.categories << @category
   end
-  
+
   # remove product from category
   def remove_from_category
     product = Product.find(params[:id])
     category = Category.find(params[:category_id])
     product.categories.delete(category)
     respond_to do |format|
-      format.js { 
-        render :partial => 'category_list', 
+      format.js {
+        render :partial => 'category_list',
         :locals => { :product_id => product.id, :categories => product.categories }
       }
     end
   end
-  
+
   # upload an image fu
   def upload_image
       @image = ProductImage.new(params[:mugshot])
       if @image.save
-        flash[:notice] = 'Mugshot was successfully created.'     
+        flash[:notice] = 'Mugshot was successfully created.'
       else
         render :action => :new
       end
   end
-  
+
   # The REST:
-  
+
   def index
     @products = Product.paginate(:page => params[:page], :order => 'name')
-    
+
     respond_to do |format|
       format.html # index.rhtml
       format.xml  { render :xml => @products.to_xml }
@@ -60,7 +60,7 @@ def show
   def new
     @product = Product.new
     3.times { @product.quantity_discounts.build }
-    
+
     @vendors = Vendor.find(:all)
     @categories = Category.find(:all)
   end
@@ -96,7 +96,7 @@ def update
       if @product.update_attributes(params[:product])
         flash[:notice] = "Product #{@product.name} was successfully updated."
         format.html { redirect_to edit_admin_product_path(@product.id) }
-        format.js 
+        format.js
       else
         @vendors = Vendor.find(:all)
         @categories = Category.root.descendants
@@ -112,7 +112,7 @@ def update
   def destroy
     @product = Product.find(params[:id])
     @product.destroy
-    redirect_to admin_products_url 
+    redirect_to admin_products_url
   end
 end
 
diff --git a/app/controllers/admin/promo_codes_controller.rb b/app/controllers/admin/promo_codes_controller.rb
index 6d014b2..03397d0 100644
--- a/app/controllers/admin/promo_codes_controller.rb
+++ b/app/controllers/admin/promo_codes_controller.rb
@@ -1,21 +1,21 @@
 module Admin
-  
+
   class PromoCodesController < ApplicationController
     layout 'admin'
     require_role 'admin'
-  
+
     def index
       @promo_codes = PromoCode.find(:all, :order => 'name')
     end
-  
+
     def new
       @promo_code = PromoCode.new
     end
-  
+
     def create
       @promo_code = PromoCode.new(params[:promo_code])
-      @promo_code.code = @promo_code.code.upcase 
-      
+      @promo_code.code = @promo_code.code.upcase
+
       respond_to do |format|
         if @promo_code.save
           flash[:notice] = 'Promo Code was successfully created.'
@@ -25,11 +25,11 @@ def create
         end
       end
     end
-    
+
     def edit
       @promo_code = PromoCode.find(params[:id])
     end
-   
+
     def update
       @promo_code = PromoCode.find(params[:id])
 
@@ -43,7 +43,7 @@ def update
          end
        end
     end
-    
+
     def destroy
       @promo_code = PromoCode.find(params[:id])
       @promo_code.destroy
@@ -53,7 +53,7 @@ def destroy
         format.xml  { head :ok }
       end
     end
-    
+
   end
-  
+
 end
\ No newline at end of file
diff --git a/app/controllers/admin/reporting/order_reports_controller.rb b/app/controllers/admin/reporting/order_reports_controller.rb
index cf84679..4c93b48 100644
--- a/app/controllers/admin/reporting/order_reports_controller.rb
+++ b/app/controllers/admin/reporting/order_reports_controller.rb
@@ -2,31 +2,31 @@
 class Admin::Reporting::OrderReportsController < ApplicationController
   layout 'admin'
   require_role 'admin'
-      
+
   def create
     generate_report = params[:generate_report]
     if generate_report
       session[:start_date] = params[:start_date]
       session[:end_date] = params[:end_date]
-      
+
       csv = render_order_report_as :csv
       send_data csv, :type => "text/csv",
-                     :filename => "orders#{session[:start_date]}.csv"      
+                     :filename => "orders#{session[:start_date]}.csv"
     end
   end
-  
+
   def csv_list
     csv = render_order_report_as :csv
     send_data csv, :type => "text/csv",
-                   :filename => "orders.csv" 
+                   :filename => "orders.csv"
   end
-  
+
   def pdf
     pdf = render_order_report_as :pdf
     send_data pdf, :type => "application/pdf",
-                   :filename => "orders.pdf" 
+                   :filename => "orders.pdf"
   end
-  
+
   protected
 
   def render_order_report_as(format)
diff --git a/app/controllers/admin/reporting/reports_controller.rb b/app/controllers/admin/reporting/reports_controller.rb
index fb1c425..9ec7ba1 100644
--- a/app/controllers/admin/reporting/reports_controller.rb
+++ b/app/controllers/admin/reporting/reports_controller.rb
@@ -2,10 +2,10 @@
 class Admin::Reporting::ReportsController < ApplicationController
   layout 'admin'
   require_role 'admin'
-      
+
   def index
-  
+
   end
-  
+
 end
 
diff --git a/app/controllers/admin/shipping_rates_controller.rb b/app/controllers/admin/shipping_rates_controller.rb
index e2912cf..2912f33 100644
--- a/app/controllers/admin/shipping_rates_controller.rb
+++ b/app/controllers/admin/shipping_rates_controller.rb
@@ -1,10 +1,10 @@
 module Admin
-  
-  
+
+
 class ShippingRatesController < ApplicationController
     layout 'admin'
     require_role "admin"
-  
+
     # GET /shipping_rates
     def index
       @shipping_rates = ShippingRate.find(:all)
@@ -18,7 +18,7 @@ def index
     # GET /shipping_rates/1.xml
     def show
       @shipping_rate = ShippingRate.find(params[:id])
-      
+
       respond_to do |format|
         format.html # show.rhtml
       end
@@ -27,7 +27,7 @@ def show
     # GET /shipping_rates/new
     def new
       puts params
-      
+
       @shipping_rate = ShippingRate.new
     end
 
diff --git a/app/controllers/admin/variant_image_thumbnails_controller.rb b/app/controllers/admin/variant_image_thumbnails_controller.rb
index 743b212..0a6ae04 100644
--- a/app/controllers/admin/variant_image_thumbnails_controller.rb
+++ b/app/controllers/admin/variant_image_thumbnails_controller.rb
@@ -1,15 +1,15 @@
 class Admin::VariantImageThumbnailsController < ApplicationController
   layout "admin"
   require_role "admin"
-  
-  def create 
+
+  def create
     variant_image = VariantImage.find(params[:variant_image_id])
-    variant_image.create_variant_image_thumbnail(params[:variant_image_thumbnail]) 
-    render :partial => "admin/products/variant_thumbnail", 
+    variant_image.create_variant_image_thumbnail(params[:variant_image_thumbnail])
+    render :partial => "admin/products/variant_thumbnail",
            :locals => { :thumbnail => variant_image.variant_image_thumbnail,
                                                :variant_image => variant_image }
   end
-  
+
   def destroy
     variant_image = VariantImage.find(params[:variant_image_id])
     thumbnail = VariantImageThumbnail.find(params[:id])
diff --git a/app/controllers/admin/variant_images_controller.rb b/app/controllers/admin/variant_images_controller.rb
index beca739..2baba9d 100644
--- a/app/controllers/admin/variant_images_controller.rb
+++ b/app/controllers/admin/variant_images_controller.rb
@@ -1,40 +1,40 @@
 class Admin::VariantImagesController < ApplicationController
   layout "admin"
   require_role "admin"
-  
+
   def new
     variant_image = VariantImage.new
     variant_image.build_variant_large_image
     variant_image.build_variant_image_thumbnail
     render :partial => "admin/products/variant_image", :locals => { :variant_image => variant_image }
   end
-  
+
   def show
     variant_image = VariantImage.find(params[:id])
     variant_image.build_variant_large_image unless variant_image.variant_large_image
     variant_image.build_variant_image_thumbnail unless variant_image.variant_image_thumbnail
     render :partial => "admin/products/variant_image", :locals => { :variant_image => variant_image }
   end
-  
-  def create 
+
+  def create
     variants = Variant.find(params[:variant_ids].split(',').map{|s| s.to_i})
     product = variants.first.product
     variant_image = VariantImage.create(params[:variant_image])
     variant_image.variants << variants
     variant_image.build_variant_large_image
     variant_image.build_variant_image_thumbnail
-    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product, 
+    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product,
                                                                :variant_image => variant_image}
   end
-  
+
   def destroy
     variant_image = VariantImage.find(params[:id])
     product = variant_image.product
     variants = product.variants
     variant_image.destroy
-    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product, 
+    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product,
                                                                :variant_image => VariantImage.new}
-    
-  end   
+
+  end
 
 end
\ No newline at end of file
diff --git a/app/controllers/admin/variant_large_images_controller.rb b/app/controllers/admin/variant_large_images_controller.rb
index e7fc2cf..0c990e5 100644
--- a/app/controllers/admin/variant_large_images_controller.rb
+++ b/app/controllers/admin/variant_large_images_controller.rb
@@ -1,22 +1,22 @@
 class Admin::VariantLargeImagesController < ApplicationController
   layout "admin"
   require_role "admin"
-  
-  def create 
+
+  def create
     variant_image = VariantImage.find(params[:variant_image_id])
-    variant_image.create_variant_large_image(params[:variant_large_image]) 
-    render :partial => "admin/products/variant_large_image", 
+    variant_image.create_variant_large_image(params[:variant_large_image])
+    render :partial => "admin/products/variant_large_image",
            :locals => { :large_image => variant_image.variant_large_image,
                         :variant_image => variant_image }
   end
-  
+
   def destroy
     variant_image = VariantImage.find(params[:variant_image_id])
     large_image = VariantLargeImage.find(params[:id])
     large_image.destroy
-    render :partial => "admin/products/variant_large_image", 
+    render :partial => "admin/products/variant_large_image",
            :locals => { :large_image => variant_image.build_variant_large_image,
                         :variant_image => variant_image }
   end
-  
+
 end
diff --git a/app/controllers/admin/variants_controller.rb b/app/controllers/admin/variants_controller.rb
index bf5bb8d..c9382b7 100644
--- a/app/controllers/admin/variants_controller.rb
+++ b/app/controllers/admin/variants_controller.rb
@@ -1,15 +1,15 @@
 class Admin::VariantsController < ApplicationController
   layout "admin"
   require_role "admin"
-  
+
   def update
     variant = Variant.find(params[:id])
     variant.variant_image_id = nil
     variant.save!
     product = variant.product
     variants = product.variants
-    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product, 
+    render :partial => "admin/products/variants", :locals => { :variants => variants, :product => product,
                                                                :variant_image => VariantImage.new}
-  end   
+  end
 
 end
\ No newline at end of file
diff --git a/app/controllers/admin/vendors_controller.rb b/app/controllers/admin/vendors_controller.rb
index bdb7fdc..5b2676c 100644
--- a/app/controllers/admin/vendors_controller.rb
+++ b/app/controllers/admin/vendors_controller.rb
@@ -3,7 +3,7 @@ module Admin
 class VendorsController < ApplicationController
   layout "admin"
   require_role "admin"
-  
+
   # GET /vendors
   # GET /vendors.xml
   def index
diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb
index 18efc23..9589d57 100644
--- a/app/controllers/carts_controller.rb
+++ b/app/controllers/carts_controller.rb
@@ -33,7 +33,7 @@ def refresh_totals
 
   def show
     @cart = current_cart
-    @cart.validate 
+    @cart.validate
     refresh_cart
   end
 
@@ -47,7 +47,7 @@ def update
       render :action => 'show'
     end
   end
-  
+
   def refresh_cart
     region = Region.find(active_shipping_region_id)
     method = active_shipping_method_id
diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index b6c46d9..e31ba7c 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -24,7 +24,7 @@ def show
 
 private
 
-  def ensure_current_post_show_url    
+  def ensure_current_post_show_url
     @category = Category.find(params[:id])
     unless @category.friendly_id_status.best?
       redirect_to @category, :status => :moved_permanently
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index cfd1f9d..9f33941 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -1,10 +1,10 @@
 class ContactsController < ApplicationController
-  
+
   def create
     begin
       ContactNotifier.deliver_contact_confirmation(params[:name], params[:email],
                                                    params[:phone], params[:extension],
-                                                   params[:comment]) 
+                                                   params[:comment])
     rescue
       render :text => 'Sorry there was a problem sending your message. Please try again later'
     end
diff --git a/app/controllers/index_controller.rb b/app/controllers/index_controller.rb
index 9ae2b5b..1339c75 100644
--- a/app/controllers/index_controller.rb
+++ b/app/controllers/index_controller.rb
@@ -7,17 +7,17 @@ def index
     @featured_products = Product.find(:all, :conditions => { :is_featured => true })
     #render :layout => 'splash'
   end
-  
+
   def send_contact
     ContactNotifier.deliver_contact_confirmation(params[:name], params[:email],
                                                  params[:phone], params[:extension],
-                                                 params[:comment]) 
+                                                 params[:comment])
   end
-  
+
   def about; end
   def charity; end
   def return_policy; end
   def shipping_information; end
 
-   
+
 end
diff --git a/app/controllers/paypal_ipn_controller.rb b/app/controllers/paypal_ipn_controller.rb
index ada217b..077e0f5 100644
--- a/app/controllers/paypal_ipn_controller.rb
+++ b/app/controllers/paypal_ipn_controller.rb
@@ -1,24 +1,24 @@
 
 class PayPal_IPN_Controller < ApplicationController
- 
+
   def paypal_ipn
     notify = Paypal::Notification.new(request.raw_post)
 
-    
+
 
     # order = Order.find(notify.item_id)
-    # 
+    #
     # if notify.acknowledge
     #   begin
-    # 
+    #
     #     if notify.complete? and order.total == notify.amount
     #       order.status = 'success'
-    # 
+    #
     #       shop.ship(order)
     #     else
     #       logger.error("Failed to verify Paypal's notification, please investigate")
     #     end
-    # 
+    #
     #   rescue => e
     #     order.status = 'failed'
     #     raise
@@ -26,7 +26,7 @@ def paypal_ipn
     #     order.save
     #   end
     # end
-    # 
+    #
     # render :nothing
   end
 
diff --git a/app/controllers/promo_codes_controller.rb b/app/controllers/promo_codes_controller.rb
index 7e963ac..98ec0a0 100644
--- a/app/controllers/promo_codes_controller.rb
+++ b/app/controllers/promo_codes_controller.rb
@@ -1,8 +1,8 @@
 class PromoCodesController < ApplicationController
   include ActionView::Helpers::NumberHelper
-  
+
   ssl_allowed :create
-  
+
   def create
     cart = current_cart
 
@@ -17,16 +17,16 @@ def create
     method = ShippingMethod.find(active_shipping_method_id)
     shipping_total = cart.shipping_total(method)
     grand_total = cart.grand_total(shipping_total)
-    
+
     render :json => { :promo_code_message => promo_code_message,
                       :promo_code_note => promo_code_note,
-                      :no_discount => discount == 0, 
-                      :discount => number_to_currency(discount),                      
+                      :no_discount => discount == 0,
+                      :discount => number_to_currency(discount),
                       :no_tax => tax_total == 0,
-                      :tax_total => number_to_currency(tax_total), 
+                      :tax_total => number_to_currency(tax_total),
                       :shipping_total => number_to_currency(shipping_total),
                       :grand_total => number_to_currency(grand_total) }
-    
+
   end
 
 end
diff --git a/app/controllers/shipping_methods_controller.rb b/app/controllers/shipping_methods_controller.rb
index 7758242..135b402 100644
--- a/app/controllers/shipping_methods_controller.rb
+++ b/app/controllers/shipping_methods_controller.rb
@@ -1,7 +1,7 @@
 class ShippingMethodsController < ApplicationController
   include ActionView::Helpers::NumberHelper
   ssl_allowed :index, :update
-  
+
   def index
     region = Region.find(params[:region_id])
     @shipping_methods = region.shipping_methods
@@ -18,7 +18,7 @@ def index
     self.active_shipping_method_id = @default_method.id
     render :layout => false
   end
-  
+
   def update
     method = ShippingMethod.find(params[:id])
 
@@ -28,11 +28,11 @@ def update
 
     # change active shipping rate depending on selection
     self.active_shipping_method_id = method.id
-    
-    render :json => { :shipping_total => number_to_currency(shipping_total), 
+
+    render :json => { :shipping_total => number_to_currency(shipping_total),
                       :grand_total => number_to_currency(grand_total) }
-    
-  end 
-    
+
+  end
+
 
 end
diff --git a/app/controllers/shippings_controller.rb b/app/controllers/shippings_controller.rb
index b057a4e..e39fb6e 100644
--- a/app/controllers/shippings_controller.rb
+++ b/app/controllers/shippings_controller.rb
@@ -6,10 +6,10 @@ def create
     quantity = params[:quantity].to_i
     product_id = params[:id]
     # create an array of selected accessory ids; note that it helps to reject the collected nil
-    accessories = ProductAccessory.selected_accessories(params[:accessories]) if params[:accessories]                        
+    accessories = ProductAccessory.selected_accessories(params[:accessories]) if params[:accessories]
     @shipping = ShippingCalculations.product_quote(product_id, quantity, zipcode, accessories)
     render :partial => 'products/shipping'
   end
-    
+
 
 end
diff --git a/app/controllers/taxes_controller.rb b/app/controllers/taxes_controller.rb
index 8896933..4936032 100644
--- a/app/controllers/taxes_controller.rb
+++ b/app/controllers/taxes_controller.rb
@@ -1,7 +1,7 @@
 class TaxesController < ApplicationController
   include ActionView::Helpers::NumberHelper
-  
-  ssl_allowed :update  
+
+  ssl_allowed :update
 
   def update
     cart = current_cart
@@ -9,15 +9,15 @@ def update
     cart.save(false)
     method = ShippingMethod.find(active_shipping_method_id)
     shipping_total = cart.shipping_total(method)
-    
+
     tax_total = cart.tax_total
     grand_total = cart.grand_total(shipping_total)
-    
+
     render :json => { :no_tax => tax_total == 0,
-                      :tax_total => number_to_currency(tax_total), 
+                      :tax_total => number_to_currency(tax_total),
                       :grand_total => number_to_currency(grand_total) }
-    
-  end 
-    
+
+  end
+
 
 end
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9197b8b..1daf1ba 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,13 +1,13 @@
 class UsersController < ApplicationController
 
-  
+
   # render new.rhtml
   def new
   end
 
   def create
     cookies.delete :auth_token
-    # protects against session fixation attacks, wreaks havoc with 
+    # protects against session fixation attacks, wreaks havoc with
     # request forgery protection.
     # uncomment at your own risk
     # reset_session
diff --git a/app/controllers/variant_images_controller.rb b/app/controllers/variant_images_controller.rb
index bfe7fae..9eaeac0 100644
--- a/app/controllers/variant_images_controller.rb
+++ b/app/controllers/variant_images_controller.rb
@@ -1,13 +1,13 @@
 class VariantImagesController < ApplicationController
-  
+
   def index
     product = Product.find(params[:product_id])
     render :partial => 'products/variant_images', :locals => { :product => product }
-  end 
-   
+  end
+
   def show
     variant_image = VariantImage.find(params[:id])
     render :partial => 'products/product_image', :locals => { :image => variant_image }
   end
-  
+
 end
diff --git a/app/controllers/variants_controller.rb b/app/controllers/variants_controller.rb
index af71786..5bc5fa9 100644
--- a/app/controllers/variants_controller.rb
+++ b/app/controllers/variants_controller.rb
@@ -1,14 +1,14 @@
 class VariantsController < ApplicationController
   include ActionView::Helpers::NumberHelper
-  
+
   def show
     product = Product.find(params[:product_id])
     variant = product.find_variant_by_selection_ids(params[:selection_ids].split(',').map{|s| s.to_i})
     inventory = Inventory.new.inventory_remaining(current_cart, product, variant)
-    render :json => { :price => number_to_currency(variant.price), 
+    render :json => { :price => number_to_currency(variant.price),
                       :out_of_stock => variant.out_of_stock_check,
-                      :variant_image_id => variant.variant_image_id, 
+                      :variant_image_id => variant.variant_image_id,
                       :inventory => inventory }
   end
-  
+
 end
diff --git a/app/helpers/pebbles/admin/shipping_methods_helper.rb b/app/helpers/pebbles/admin/shipping_methods_helper.rb
index b7dd08f..c0af050 100644
--- a/app/helpers/pebbles/admin/shipping_methods_helper.rb
+++ b/app/helpers/pebbles/admin/shipping_methods_helper.rb
@@ -1,19 +1,19 @@
 module Pebbles::Admin::ShippingMethodsHelper
   def add_fulfillment_link(name)
     link_to_function name do |page|
-      page.insert_html :bottom, :fulfillment_codes, 
+      page.insert_html :bottom, :fulfillment_codes,
       :partial => 'fulfillment_code',
       :object => FulfillmentCode.new
     end
   end
-  
+
   def set_up_shippping_method(shipping_method)
     returning(shipping_method) do |m|
-      10.times do 
+      10.times do
         m.flat_rate_shippings.build
       end
     end
   end
-  
-  
+
+
 end
diff --git a/app/helpers/pebbles/inventory_helper.rb b/app/helpers/pebbles/inventory_helper.rb
index e94c705..346170e 100644
--- a/app/helpers/pebbles/inventory_helper.rb
+++ b/app/helpers/pebbles/inventory_helper.rb
@@ -13,8 +13,8 @@ def validate_inventory?
       "inventory"
     end
   end
-    
- 
+
+
   ##
   #
   def inventory_management_hidden_field(inventory)
diff --git a/app/helpers/pebbles/products_helper.rb b/app/helpers/pebbles/products_helper.rb
index e740aac..1a738ff 100644
--- a/app/helpers/pebbles/products_helper.rb
+++ b/app/helpers/pebbles/products_helper.rb
@@ -4,20 +4,20 @@ module Pebbles::ProductsHelper
   # Add a image magnifier if the large image exists.
   #
   # @param[String] image The name of the image to use as a magnifier.
-  # @param[String] image_url The url of the image being magnifed. 
-  # @param[Hash] options Additonal options, class, etc. 
-  def image_magnify(image, image_url, options={}) 
+  # @param[String] image_url The url of the image being magnifed.
+  # @param[Hash] options Additonal options, class, etc.
+  def image_magnify(image, image_url, options={})
     if image_url.present?
       image_tag image, options
     end
   end
 
   ##
-  # Creates a light boxed image link if the image to lightbox exists. 
+  # Creates a light boxed image link if the image to lightbox exists.
   #
-  # @param[String] image_url The image url to link to a lightbox. 
-  # @param[String] light_boxed_image The image url of the image to lightbox. 
-  # @param[Hash] options Options to pass to the image tag. 
+  # @param[String] image_url The image url to link to a lightbox.
+  # @param[String] light_boxed_image The image url of the image to lightbox.
+  # @param[Hash] options Options to pass to the image tag.
   def light_box(image_url, light_boxed_image, options={})
     if light_boxed_image.blank?
       # just show image
@@ -32,5 +32,5 @@ def light_box(image_url, light_boxed_image, options={})
   def disable(category, product)
     'disabled="disabled"' if product.category_ids.include?(category.id)
   end
-  
+
 end
diff --git a/app/helpers/pebbles/variants_helper.rb b/app/helpers/pebbles/variants_helper.rb
index f993d1f..2bc9a56 100644
--- a/app/helpers/pebbles/variants_helper.rb
+++ b/app/helpers/pebbles/variants_helper.rb
@@ -8,5 +8,5 @@ def variant_thumbnail(image)
     thumbnail = image.variant_image_thumbnail || image
     thumbnail.filename.url
   end
-  
+
 end
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 21bec80..133b26c 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -2,6 +2,6 @@ module Exceptions
   class OrderException < RuntimeError; end
   class EbayOrderException < RuntimeError; end
   class WebOrderException < RuntimeError; end
-  
+
   class FulfillmentException < RuntimeError; end
 end
\ No newline at end of file
diff --git a/app/lib/inventory.rb b/app/lib/inventory.rb
index 6c272b7..853e112 100644
--- a/app/lib/inventory.rb
+++ b/app/lib/inventory.rb
@@ -1,17 +1,17 @@
 class Inventory
-  
+
   def initialize
     @inventory_managed = inventory_managed?
   end
-  
+
   def inventory_managed?
     GeneralConfiguration.instance.inventory_management?
   end
-  
+
   ##
   # Validates a cart adding errors when cart_items exceed current inventory for product or variant
   #
-  # @param [Cart] cart cart to validate 
+  # @param [Cart] cart cart to validate
   def validate_cart(cart)
     if @inventory_managed
       cart.cart_items.each do |cart_item|
@@ -27,7 +27,7 @@ def validate_cart(cart)
       end
     end
   end
-  
+
   ##
   # Decreases the inventory for the products and or variants for items in an order
   #
@@ -39,7 +39,7 @@ def decrease_order_inventory(order)
       end
     end
   end
-  
+
   ##
   # returns the inventory remaining for a product or variant minus any existing cart_item quantities
   #
@@ -50,7 +50,7 @@ def decrease_order_inventory(order)
   # @return [<Integer, nil>] the inventory remaining or nil if no inventory is being managed
   def inventory_remaining(cart, product, variant = nil)
     if @inventory_managed
-      inventory = (variant || product).inventory 
+      inventory = (variant || product).inventory
       existing_cart_item = cart.find_product_or_variant(product, variant)
       inventory -= existing_cart_item.quantity if existing_cart_item
       inventory
@@ -60,7 +60,7 @@ def inventory_remaining(cart, product, variant = nil)
   end
 
 private
-  
+
   ##
   # Validates a cart_item adjusting its quantity and adding an error if quantity exceeds inventory
   #
@@ -78,7 +78,7 @@ def validate_cart_item(cart_item)
       return true
     end
   end
-  
+
   ##
   # Decreases the inventory for the product or variant of an order_item
   #
diff --git a/app/lib/order_calculations.rb b/app/lib/order_calculations.rb
index 9f63aa5..ae5d31d 100644
--- a/app/lib/order_calculations.rb
+++ b/app/lib/order_calculations.rb
@@ -8,21 +8,21 @@ def product_total
   def sub_total
     product_total - promo_discount
   end
-  
+
   def total
-    total_cost = self.product_cost + self.shipping_cost + 
+    total_cost = self.product_cost + self.shipping_cost +
       self.drop_shipping_cost + self.tax - self.promo_discount
     sprintf("%.2f", total_cost).to_f
   end
-  
+
   def total_in_cents
     self.total * 100
   end
-  
+
   def shipping_handling
     self.shipping_cost + self.drop_shipping_cost
   end
-  
+
   def calculate_order_costs
     self.shipment_weight_total = 1.0 # default to one right now
     self.product_cost = product_total
@@ -33,39 +33,39 @@ def calculate_order_costs
     # drop_ship_vendors = Array.new
     #     self.order_items.each do |item|
     #       self.product_cost += item.quantity * item.adjusted_price
-    # 
+    #
     #       if item.drop_ship
     #         unless drop_ship_vendors.include?(item.supplier_id)
     #           # vendor does not exist in the array, so
     #           # add the drop ship amount for this vendor
     #           # to the order's total drop ship amount
     #           self.drop_shipping_cost += item.drop_shipping_cost
-    # 
-    #           # add vendor to the array, so drop ship amount isn't re-added 
+    #
+    #           # add vendor to the array, so drop ship amount isn't re-added
     #           # if the customer has another item in his cart from this vendor
-    #           drop_ship_vendors.push(item.supplier_id)          
+    #           drop_ship_vendors.push(item.supplier_id)
     #         end
     #       else
     #         #TODO: if free shipping
     #         #self.shipment_weight_total += item.quantity * item.adjusted_weight
     #       end
     #     end
-    #     #calculate_quantity_discounts 
+    #     #calculate_quantity_discounts
     #     #calculate_tax
     total
   end
-  
-  
+
+
   def calculate_quantity_discounts
-    # quantity discounts 
+    # quantity discounts
     discount = 0
-    self.order_items.each do |order_item| 
+    self.order_items.each do |order_item|
      # discount += QuantityDiscount.determine_discount(order_item)
     end
     self.product_cost -= discount
   end
-  
-  
+
+
   def calculate_tax
     t = 0
     unless billing_address.nil?
diff --git a/app/lib/order_factory.rb b/app/lib/order_factory.rb
index ebac83c..083618c 100644
--- a/app/lib/order_factory.rb
+++ b/app/lib/order_factory.rb
@@ -1,12 +1,12 @@
 include ActiveMerchant::Billing
 
 class OrderFactory
-  
+
   WEB_ORDER_DEFAULTS = { :order_type => OrderType::WEB, :payment_type => 'credit_card', :delivery_status => 1 }
-  
+
   class << self
-    
-    # create an order from a paypal notification 
+
+    # create an order from a paypal notification
     # Exception::EbayOrderException thrown if an issue is encountered
     def create_ebay_order(notify)
 
@@ -26,7 +26,7 @@ def create_ebay_order(notify)
         :postal_code => notify.address_zip,
         :country     => notify.address_country_code
       )
-      
+
       order = Order.new
       order.order_type = OrderType::EBAY
       order.build_order_number('E')
@@ -34,17 +34,17 @@ def create_ebay_order(notify)
       unless billing_address.save
         errors = billing_address.errors.collect { |e| e }
         msg = "eBay Error: Invalid billing address: #{errors},
-               #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id}, 
+               #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id},
                item number: #{notify.item_number}."
          order.admin_notes = msg
          order.issue_raised!
          order.issue_raised!
-        raise Exceptions::EbayOrderException, msg, caller  
+        raise Exceptions::EbayOrderException, msg, caller
       end
       unless shipping_address.save
         errors = billing_address.errors.collect { |e| e }
         msg = "eBay Error: Invalid billing address: #{errors},
-               #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id}, 
+               #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id},
                item number: #{notify.item_number}."
         order.admin_notes = msg
         order.issue_raised!
@@ -59,7 +59,7 @@ def create_ebay_order(notify)
       order.ebay_auction_id = notify.auction_buyer_id
       order.ebay_item_number = notify.item_number
       order.phone_number = '555-555-5555'
-    
+
       # create order items
       for i in (1...notify.num_cart_items+1)
         name = notify.item_name(i)
@@ -70,25 +70,25 @@ def create_ebay_order(notify)
           order.order_items << OrderItem.from_ebay_order(product, quantity)
         else
           msg = "eBay Error: Product received from eBay is not a valid product: #{notify.item_name(i)},
-                 #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id}, 
-                 item number: #{notify.item_number}." 
+                 #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id},
+                 item number: #{notify.item_number}."
           order.admin_notes = msg
           order.issue_raised!
           order.issue_raised!
           raise Exceptions::EbayOrderException, msg, caller
         end
       end
-      order = shipping_method_translation(order, billing_address.country, notify)      
+      order = shipping_method_translation(order, billing_address.country, notify)
       order.calculate_order_costs
-      
+
       order.save!   # raise exception if error
-       
+
       order
     end
-    
+
     # build a paypal order
     def create_paypal_order(cart, details, active_shipping_region_id, active_shipping_method_id)
-      order = Order.new 
+      order = Order.new
       order.order_type = OrderType::WEB
       billing_address = Address.new(
         :address_1   => details.address['address1'],
@@ -112,28 +112,28 @@ def create_paypal_order(cart, details, active_shipping_region_id, active_shippin
       order.full_name = details.name
       order.phone_number = '555-555-5555'
       order.email = details.email
-      
+
       order.shipping_method_id = active_shipping_method_id
       order.region_id = active_shipping_region_id
       order.add_order_items_from_cart(cart)
       order.calculate_order_costs
-      
+
       order.payment_type = 'paypal'
-      
-      order.save! 
-      
+
+      order.save!
+
       order
     end
-    
-    
+
+
     # build a web order
     def create_web_order(cart, options = {})
-        
-      order = Order.new(WEB_ORDER_DEFAULTS.merge(options[:order]))     
+
+      order = Order.new(WEB_ORDER_DEFAULTS.merge(options[:order]))
       billing_address = Address.new(options[:billing_address])
-      
+
       # piece-meal validation so user sees validation in steps
-      
+
       # shipping address?
       shipping_same = true unless options[:address_choice].nil?
       unless shipping_same
@@ -141,11 +141,11 @@ def create_web_order(cart, options = {})
       else
         shipping_address = billing_address.clone
       end
-      
-      order.shipping_address = shipping_address 
+
+      order.shipping_address = shipping_address
       order.billing_address = billing_address
 
-      # CC validation 
+      # CC validation
       credit_card = CreditCard.new(options[:credit_card])
       credit_card.require_verification_value = true
       order.credit_card = credit_card
@@ -153,7 +153,7 @@ def create_web_order(cart, options = {})
         billing_address.valid? && shipping_address.valid?
       if valid
         order.credit_card_display = order.credit_card.display_number
-                
+
         order.shipping_method_id = options[:active_shipping_method_id]
         order.region_id = options[:active_shipping_region_id]
         order.add_order_items_from_cart(cart)
@@ -165,9 +165,9 @@ def create_web_order(cart, options = {})
       end
       order
     end
-    
-  private 
-   
+
+  private
+
       # set the region and shipping method by region
       def shipping_method_translation(order, country, notify)
         # shipping method is same as standard shipping, United States
@@ -193,8 +193,8 @@ def shipping_method_translation(order, country, notify)
           order.region_id = region.id
         else
          msg = "eBay Error: Region not found: #{order.billing_address.country},
-                 #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id}, 
-                 trying region #{trying_region}, trying method #{trying_method}" 
+                 #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id},
+                 trying region #{trying_region}, trying method #{trying_method}"
           order.admin_notes = msg
           order.issue_raised!
           order.issue_raised!
@@ -205,24 +205,24 @@ def shipping_method_translation(order, country, notify)
           order.shipping_method = shipping_method.name
         else
           msg = "eBay Error: Shipping Method not found: #{order.billing_address.country},
-                  #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id}, 
-                  trying region #{trying_region}, trying method #{trying_method}" 
+                  #{DateTime.now}, auction buyer id: #{notify.auction_buyer_id},
+                  trying region #{trying_region}, trying method #{trying_method}"
            order.admin_notes = msg
            order.issue_raised!
            order.issue_raised!
            raise Exceptions::EbayOrderException, msg, caller
-        end    
+        end
         order
       end
-      
+
       # find a product by sku
       def product_from(sku)
         product = Product.find(:first, :conditions => { :sku => sku })
       end
-      
+
       # parse a sku out of the ebay product subject
       def grab_sku(name)
-        if name 
+        if name
           # TODO: use regexp
           i1 = name.index('(')
           i2 = name.index(')')
@@ -233,6 +233,6 @@ def grab_sku(name)
           sku.gsub(/\s/, '')  # remove spaces
         end
       end
-      
+
   end
 end
diff --git a/app/lib/order_processing.rb b/app/lib/order_processing.rb
index 1d90e93..5cb3acc 100644
--- a/app/lib/order_processing.rb
+++ b/app/lib/order_processing.rb
@@ -1,9 +1,9 @@
 # Handle processing of an order
-module OrderProcessing 
-    
+module OrderProcessing
+
     # process the order with the current merchant
     def process
-      if self.order_items.size > 0 
+      if self.order_items.size > 0
         case self.order_type
         when OrderType::WEB
           process_web_order
@@ -14,13 +14,13 @@ def process
         end
       end
     end
-    
+
     # make an authorization on a payment
     def authorize_payment(options = {})
       options = populate_options if options.size == 0
       options[:order_id] = self.order_number
       transaction do
-        authorization = OrderTransaction.authorize(self.total_in_cents, 
+        authorization = OrderTransaction.authorize(self.total_in_cents,
                                                    self.credit_card, options
                         )
         self.transactions << authorization
@@ -35,7 +35,7 @@ def authorize_payment(options = {})
 
     # return the authorized reference for further use
     def authorization_reference
-      if authorization = transactions.find_by_action_and_success('authorization', 
+      if authorization = transactions.find_by_action_and_success('authorization',
                                                                  true, :order => 'id ASC')
         authorization.reference
       end
@@ -49,7 +49,7 @@ def authorization_reference
     def capture_payment(options = {})
       options = populate_options if options.size == 0
 
-      amount = if options[:amount] 
+      amount = if options[:amount]
         options[:amount] * 100
       else
         self.total_in_cents
@@ -66,9 +66,9 @@ def capture_payment(options = {})
         capture
       end
     end
-    
+
 private
-    
+
     # TODO: move to acts_as_state_machine transitions
     def initialize_order
       save!
@@ -82,23 +82,23 @@ def initialize_order
       end
       build_order_number(prefix)
     end
-  
+
     def process_ebay_order
       initialize_order
       # send off to integration
       ShippingFulfillment.fulfill_order(self)
     end
-     
+
     def process_web_order
       initialize_order
       if self.payment_type == 'credit_card'
-        process_with_active_merchant 
+        process_with_active_merchant
 
         unless self.paid? || self.authorized?
           msg = self.transactions[0].params['error']
           raise Exceptions::OrderException, msg, caller
         end
-                
+
         if APP_CONFIG['fulfillment'] == true
           if self.paid?
             ShippingFulfillment.fulfill_order(self)
@@ -107,13 +107,13 @@ def process_web_order
               raise Exceptions::OrderException, msg, caller
             end
           elsif self.payment_type == 'paypal'
-            begin 
+            begin
               ShippingFulfillment.fulfill_order(self)
-            rescue 
+            rescue
             end
-          end 
+          end
         end
-      
+
         OrderNotifier.deliver_order_confirmation(self, self.email, '128.9.0.0')
         OrderNotifier.deliver_supplier_confirmation(self, self.email, '128.9.0.0')
     end
@@ -138,13 +138,13 @@ def populate_options
           :country => self.shipping_address.country,
           :phone => self.phone_number
         },
-        :company => self.business, 
+        :company => self.business,
         :order_id => self.id,
         :customer => self.full_name,
         :email => self.email
       }
     end
-    
+
     # Active Merchant order processing
     def process_with_active_merchant
       options = populate_options
@@ -157,5 +157,5 @@ def process_with_active_merchant
         end
       end
     end
-    
+
 end
diff --git a/app/lib/order_state_machine.rb b/app/lib/order_state_machine.rb
index 1aab85d..93eb99e 100644
--- a/app/lib/order_state_machine.rb
+++ b/app/lib/order_state_machine.rb
@@ -1,14 +1,14 @@
 module OrderStateMachine
-  
+
   def self.included(base)
-    base.class_eval do 
+    base.class_eval do
       aasm_column :state
       aasm_initial_state :pending
 
-      aasm_state :pending 
+      aasm_state :pending
       aasm_state :authorized
-      aasm_state :paid, :enter => :decrease_inventory 
-      aasm_state :payment_declined 
+      aasm_state :paid, :enter => :decrease_inventory
+      aasm_state :payment_declined
       aasm_state :refunded
       aasm_state :disputed
       aasm_state :shipping_delayed
@@ -16,7 +16,7 @@ def self.included(base)
       aasm_state :shipped
       aasm_state :issue
 
-      # state events 
+      # state events
       aasm_event :payment_authorized do
         transitions :from => :pending,
                     :to => :authorized
@@ -36,10 +36,10 @@ def self.included(base)
 
         transitions :from => :payment_declined,
                     :to   => :payment_declined
-                    
+
         transitions :from => :authorized,
                     :to   => :payment_declined
-        
+
       end
 
       aasm_event :issue_raised do
@@ -49,7 +49,7 @@ def self.included(base)
         transitions :from => :paid,
                     :to => :issue
 
-        transitions :from => :authorized, 
+        transitions :from => :authorized,
                     :to => :issue
       end
 
@@ -76,9 +76,9 @@ def self.included(base)
       end
     end
   end
-  
+
   def decrease_inventory
     Inventory.new.decrease_order_inventory(self)
   end
-  
+
 end
diff --git a/app/lib/shipping_calculations.rb b/app/lib/shipping_calculations.rb
index 9fb24c8..a7854c0 100644
--- a/app/lib/shipping_calculations.rb
+++ b/app/lib/shipping_calculations.rb
@@ -10,13 +10,13 @@ def calculate_shipping_costs
     end
     price
   end
-  
+
   def shipping_weight_total
     self.line_items.to_a.sum {|i| i.product.free_shipping? ? 0 : i.product.weight * i.quantity}
   end
-  
+
 private
-  
+
   ##
   # Calculate shipping cost using flat rates of order total.
   #
@@ -25,25 +25,25 @@ def calculate_flat_rate_shipping
     shipping_method = ShippingMethod.find(self.shipping_method_id)
     price = shipping_method.flat_rate_shipping_cost(self)
   end
-  
+
 
 
 
 ###
 #### REFACTOR: All of this is from people powered machines and needs review
 ###
-  
+
   # calculate cost for product item
   def self.product_quote(product_id, quantity, zipcode, accessories = [])
     product = Product.find(product_id)
-    quote = case product.determined_shipping_type 
+    quote = case product.determined_shipping_type
     when ShippingType::FREE_SHIPPING
       0
     when ShippingType::FLAT_RATE_SHIPPING
       self.flat_rate_shipping_quote(product, accessories, zipcode, quantity)
     when ShippingType::REAL_TIME_SHIPPING
       self.real_time_shipping_quote(product, accessories, zipcode, quantity)
-    end 
+    end
     quote
   end
 
@@ -63,19 +63,19 @@ def calculate_real_time_shipping(items, zipcode)
     end
     shipping_total
   end
-  
+
 
   def self.flat_rate_shipping_quote(product, accessories, zipcode, quantity)
     quote = product.flat_rate_shipping * quantity
     specifications = Array.new
     quote += self.accessory_quote(specifications, accessories, zipcode, product.vendor.zipcode)
   end
-  
+
   def self.real_time_shipping_quote(product, accessories, zipcode, quantity)
     specifications = quantity_specifications(product, quantity)
     quote = self.accessory_quote(specifications, accessories, zipcode, product.vendor.zipcode)
   end
-  
+
   def self.accessory_quote(specifications, accessories, zipcode, vendor_zipcode)
     quote = 0
     accessories.each do |accessory|
@@ -84,8 +84,8 @@ def self.accessory_quote(specifications, accessories, zipcode, vendor_zipcode)
         quote += 0
       when ShippingType::FLAT_RATE_SHIPPING
         quote += accessory.flat_rate_shipping
-      when ShippingType::REAL_TIME_SHIPPING 
-        # for now we are assuming that only one accessory is added otherwise this will need to 
+      when ShippingType::REAL_TIME_SHIPPING
+        # for now we are assuming that only one accessory is added otherwise this will need to
         # do something like quantity.times do...
         specifications << accessory.specification
       end
@@ -93,12 +93,12 @@ def self.accessory_quote(specifications, accessories, zipcode, vendor_zipcode)
     quote += self.shipping_quote(specifications, zipcode, vendor_zipcode) unless specifications.empty?
     quote
   end
-  
+
   def self.shipping_quote(specifications, zipcode, vendor_zipcode)
     packages = build_packages(specifications)
     quote = quote_packages(packages, zipcode, vendor_zipcode)
   end
-  
+
   def self.build_packages(specifications)
     packages = Array.new
     specifications.each do |specification|
@@ -107,28 +107,28 @@ def self.build_packages(specifications)
     end
     packages
   end
-    
+
   def self.quote_packages(packages, zipcode, vendor_zipcode)
     origin = Location.new(:country => 'US', :zip => vendor_zipcode)
     country = /^\d{5}([\-]\d{4})?$/.match(zipcode)? 'US' : 'CA'
     destination = Location.new(:country => country, :postal_code => zipcode)
-    ups = UPS.new(:login => APP_CONFIG['ups_login'], :password => APP_CONFIG['ups_password'], 
+    ups = UPS.new(:login => APP_CONFIG['ups_login'], :password => APP_CONFIG['ups_password'],
                   :key => APP_CONFIG['ups_key'])
     response = ups.find_rates(origin, destination, packages)
     quote = response.rates.sort_by(&:price).first.price * 0.01
   end
-  
+
   def self.quantity_specifications(product, quantity)
     specifications = Array.new
-    quantity.times do 
+    quantity.times do
       specification = product.specification
       specifications << specification
     end
     specifications
   end
-  
+
   def calculate_shipping_per_vendor(items, zipcode, vendor_zipcode)
-    # we create a separate package for each quantity of each item 
+    # we create a separate package for each quantity of each item
     specifications = Array.new
     shipping_total = 0
     items.each do |item|
@@ -138,18 +138,18 @@ def calculate_shipping_per_vendor(items, zipcode, vendor_zipcode)
         shipping_total += 0
       when ShippingType::FLAT_RATE_SHIPPING
         shipping_total += product.flat_rate_shipping
-      when ShippingType::REAL_TIME_SHIPPING 
+      when ShippingType::REAL_TIME_SHIPPING
         specifications += ShippingCalculations.quantity_specifications(product, item.quantity)
       end
     end
-    unless specifications.empty?  
+    unless specifications.empty?
       shipping_total += ShippingCalculations.shipping_quote(specifications, zipcode, vendor_zipcode)
     end
     shipping_total
   end
-  
+
   def total_weight(items)
     sum = items.sum {|item| item.quantity * item.product.weight}
   end
-  
+
 end
diff --git a/app/lib/shipping_type.rb b/app/lib/shipping_type.rb
index 37f67d4..ee90565 100644
--- a/app/lib/shipping_type.rb
+++ b/app/lib/shipping_type.rb
@@ -3,10 +3,10 @@ class ShippingType
   FLAT_RATE_SHIPPING = 1
   REAL_TIME_SHIPPING = 2
   FREE_SHIPPING = 3
-  
+
   CONFIGURATION_SHIPPING_TYPES = { 1 => "flat rate shipping" , 2 => "real time shipping"}
   VENDOR_SHIPPING_TYPES = { 1 => "flat rate shipping" , 2 => "real time shipping",
                             3 => "free shipping"}
-  PRODUCT_SHIPPING_TYPES = { 0 => "default vendor shipping", 1 => "flat rate shipping", 
+  PRODUCT_SHIPPING_TYPES = { 0 => "default vendor shipping", 1 => "flat rate shipping",
                              2 => "real time shipping", 3 => "free shipping" }
 end
\ No newline at end of file
diff --git a/app/lib/wholesaler.rb b/app/lib/wholesaler.rb
index 6a1eeb1..f5f4099 100644
--- a/app/lib/wholesaler.rb
+++ b/app/lib/wholesaler.rb
@@ -1,16 +1,16 @@
 module Wholesaler
-  
+
   def verify_wholesaler
     @is_wholesaler = false
-       unless session[:wholesaler] == nil 
+       unless session[:wholesaler] == nil
          @is_wholesaler = true
-       end 
+       end
     @is_wholesaler
   end
-  
+
   def download_file
     send_file("public/TestingDownload.txt", :disposition => "attachment")
   end
-  
-  
+
+
 end
\ No newline at end of file
diff --git a/app/models/cart.rb b/app/models/cart.rb
index d6b45c9..a44aa83 100644
--- a/app/models/cart.rb
+++ b/app/models/cart.rb
@@ -2,29 +2,29 @@
 # should be extracted/abstracted out someway to share common impl
 class Cart < ActiveRecord::Base
   include ShippingCalculations
-  
+
   has_many :cart_items, :order => 'product_id, variant_id'
   has_many :products, :through => :cart_items
-  
+
   validates_length_of :name, :in => 1..40
-  
+
   accepts_nested_attributes_for :cart_items
-  
+
   attr_accessor :shipping_method_id
-  
+
   def validate
     Inventory.new.validate_cart(self)
   end
-  
+
   def line_items
     cart_items
   end
-  
+
   # order cart items
   def ordered_cart_items
     cart_items.find(:all, :order => 'product_id')
   end
-  
+
   def product_total
     cart_items.inject(0) {|sum, n| n.price * n.quantity + sum}
   end
@@ -32,18 +32,18 @@ def product_total
   def sub_total
     product_total - promo_discount
   end
-  
+
   # shipping totals
   def shipping_total(shipping_method)
     self.shipping_method_id = shipping_method
     calculate_shipping_costs
   end
-  
+
   # calculate total price
   def grand_total(shipping_total)
      product_total + shipping_total + tax_total - self.promo_discount
   end
-  
+
   # calculate total price in cents
   def grand_total_in_cents(shipping_total)
      (sub_total + shipping_total) * 100
@@ -53,9 +53,9 @@ def grand_total_in_cents(shipping_total)
   # Add the product to the cart with any options selected.
   #
   # @param [Integer] product_id Id of product to add. # TODO change to product
-  # @param [Integer] quantity The number of products to add. 
-  # @param [Array] options List of options that were selected for the product. 
-  # @return [CartItem] The newly created or existing cart item. 
+  # @param [Integer] quantity The number of products to add.
+  # @param [Array] options List of options that were selected for the product.
+  # @return [CartItem] The newly created or existing cart item.
   def add_product(product_id, quantity, options)
     cart_item = nil
     Cart.transaction do
@@ -67,7 +67,7 @@ def add_product(product_id, quantity, options)
     end
     cart_item
   end
-  
+
   ##
   # returns the cart item that matches the product or variant
   #
@@ -78,7 +78,7 @@ def add_product(product_id, quantity, options)
   def find_product_or_variant(product, variant)
     cart_items.find(:first, :conditions => { :product_id => product, :variant_id => variant })
   end
-  
+
 
   def tax_total
     tax = 0
@@ -89,7 +89,7 @@ def tax_total
 private
 
   ##
-  # Add a cart item to the cart. 
+  # Add a cart item to the cart.
   #
   # @param [CartItem] cart_item An existing cart item or a new one will be created.
   # @param [Product] product The product to add to the cart.
@@ -111,6 +111,6 @@ def add_to_cart(cart_item, product, quantity, variant)
     end
     cart_item
   end
-  
 
-end 
+
+end
diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb
index 2eb439b..6bf1656 100644
--- a/app/models/cart_item.rb
+++ b/app/models/cart_item.rb
@@ -3,26 +3,26 @@ class CartItem < ActiveRecord::Base
   belongs_to :cart
   belongs_to :product
   belongs_to :variant
-  
-  has_many :option_selections, 
+
+  has_many :option_selections,
            :class_name => 'CartItemSelection'
-           
-  validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0 
-  
-  cattr_accessor :discounted  
- 
+
+  validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
+
+  cattr_accessor :discounted
+
   def price
     # take quantity discount into consideration
     # self.discounted = false
     # unless @price
-    #   # TODO: if wholesale module 
+    #   # TODO: if wholesale module
     #   @price = QuantityDiscount.discounted_price(self)
     #   self.discounted = true if @price != product.price
     # end
     # @price
     self.discounted = false
     if variant
-      self.variant.price 
+      self.variant.price
     else
       self.product.price
     end
@@ -41,8 +41,8 @@ def valid_quantity(quantity)
       # default to one
       quantity <= 0 ? 1 : quantity
     end
-    
+
     private
-    
+
   end
 end
diff --git a/app/models/category_icon.rb b/app/models/category_icon.rb
index 6f97aa9..a542314 100644
--- a/app/models/category_icon.rb
+++ b/app/models/category_icon.rb
@@ -1,10 +1,10 @@
 class CategoryIcon < ActiveRecord::Base
-  
+
   belongs_to :category
   has_one :category_icon_hover, :dependent => :destroy
-    
+
   mount_uploader :filename, CategoryIconUploader
-  
+
   validates_presence_of :filename
-  
+
 end
\ No newline at end of file
diff --git a/app/models/category_icon_hover.rb b/app/models/category_icon_hover.rb
index 70d6d30..a715ab5 100644
--- a/app/models/category_icon_hover.rb
+++ b/app/models/category_icon_hover.rb
@@ -1,9 +1,9 @@
 class CategoryIconHover < ActiveRecord::Base
-  
+
   belongs_to :category_icon
-    
+
   mount_uploader :filename, CategoryIconUploader
 
   validates_presence_of :filename
-  
+
 end
\ No newline at end of file
diff --git a/app/models/category_image.rb b/app/models/category_image.rb
index f25f83b..1ac72ea 100644
--- a/app/models/category_image.rb
+++ b/app/models/category_image.rb
@@ -1,9 +1,9 @@
 class CategoryImage < ActiveRecord::Base
-  
+
   belongs_to :category
-    
+
   mount_uploader :filename, ImageUploader
-  
+
   validates_presence_of :filename
-  
+
 end
\ No newline at end of file
diff --git a/app/models/configuration.rb b/app/models/configuration.rb
index 9a2c72e..7d0b388 100644
--- a/app/models/configuration.rb
+++ b/app/models/configuration.rb
@@ -1,3 +1,3 @@
 class Configuration < ActiveRecord::Base
-  
+
 end
\ No newline at end of file
diff --git a/app/models/fulfilllment_code.rb b/app/models/fulfilllment_code.rb
index 64d8bc4..b86d59f 100644
--- a/app/models/fulfilllment_code.rb
+++ b/app/models/fulfilllment_code.rb
@@ -1,4 +1,4 @@
 class FulfillmentCode < ActiveRecord::Base
     belongs_to :flat_rate_shipping
-    
+
 end
diff --git a/app/models/optimization.rb b/app/models/optimization.rb
index 56fc527..a64404e 100644
--- a/app/models/optimization.rb
+++ b/app/models/optimization.rb
@@ -1,3 +1,3 @@
 class Optimization < ActiveRecord::Base
-  
+
 end
\ No newline at end of file
diff --git a/app/models/order_address.rb b/app/models/order_address.rb
index d11790f..10e1f4e 100644
--- a/app/models/order_address.rb
+++ b/app/models/order_address.rb
@@ -1,9 +1,9 @@
 class OrderAddress < ActiveRecord::Base
-  
+
   validates_length_of :address_1, :in => 2..50
   validates_length_of :city, :in => 2..50
   validates_length_of :state, :is => 2
   validates_format_of :postal_code, :with => /^\d{5}([\-]\d{4})?$/,
                       :message => 'should be in the format "12345" or "12345-1234"'
-  
+
 end
diff --git a/app/models/order_item_selection.rb b/app/models/order_item_selection.rb
index 6f8d2e6..fb308a1 100644
--- a/app/models/order_item_selection.rb
+++ b/app/models/order_item_selection.rb
@@ -1,16 +1,16 @@
 class OrderItemSelection < ActiveRecord::Base
   belongs_to :order_item
-  
-  
+
+
   def self.from_product_option_selection(product_option_selection)
     ois = self.new
- 
+
     ois.product_option_name = product_option_selection.product_option.name
     ois.option_selection_name = product_option_selection.name
     ois.price_adjustment = product_option_selection.price_adjustment
     ois.weight_adjustment = product_option_selection.weight_adjustment
-    ois.sku_adjustment = product_option_selection.sku_adjustment   
-    
+    ois.sku_adjustment = product_option_selection.sku_adjustment
+
     ois
   end
 end
diff --git a/app/models/out_of_stock_option.rb b/app/models/out_of_stock_option.rb
index 6212dec..7bac0d1 100644
--- a/app/models/out_of_stock_option.rb
+++ b/app/models/out_of_stock_option.rb
@@ -1,34 +1,34 @@
 class OutOfStockOption < ActiveRecord::Base
-  
+
   belongs_to :product
   has_many :out_of_stock_option_selections, :dependent => :destroy
-  
+
   def self.out_of_stock?(product_id, product_option_selection_ids)
     # first find all the product_options with that product_id and include
     # and preload the selections
-    out_of_stock_options = 
+    out_of_stock_options =
       OutOfStockOption.find(:all,
                             :conditions => { :product_id => product_id },
-                            :include => :out_of_stock_option_selections )             
+                            :include => :out_of_stock_option_selections )
     selection_found = false
-    
+
     # now generate an array of product_option_selection_ids for each out_of_stock
     # product and compare with the passed selection array.
     out_of_stock_options.each do |item|
       out_of_stock_option_selection_ids = Array.new
-      item.out_of_stock_option_selections.each do |selection| 
-        out_of_stock_option_selection_ids << 
+      item.out_of_stock_option_selections.each do |selection|
+        out_of_stock_option_selection_ids <<
               selection.product_option_selection_id.to_s
       end
-      if out_of_stock_option_selection_ids.sort == 
+      if out_of_stock_option_selection_ids.sort ==
           product_option_selection_ids.sort
         selection_found = true
       end
     end
-    
+
     selection_found
   end
-  
+
   # return all the out of stock selections as a concated string
   def out_of_stock_selection_string
     out_of_stock_option_selections.collect { |x| x.product_option_selection.name + ', ' }
diff --git a/app/models/product_accessory.rb b/app/models/product_accessory.rb
index fddbd61..d9756d6 100644
--- a/app/models/product_accessory.rb
+++ b/app/models/product_accessory.rb
@@ -1,19 +1,19 @@
 class ProductAccessory < ActiveRecord::Base
-  
+
   belongs_to :product
   belongs_to :accessory, :class_name => 'Product'
   has_many :cart_items
-  
+
   def name
     accessory.name
   end
-  
+
   def price
     accessory.accessory_price(product)
   end
-  
+
   # finds accessories from the crazy hash generated by the combined products/_product_accessories
-  # and products/_accessory_options views. An accessories_hash for a selected_accessory id 82 with 
+  # and products/_accessory_options views. An accessories_hash for a selected_accessory id 82 with
   # an option selection of id 45 looks like this: {"82"=>{"options"=>"45", "82"=>"1"}}
   def self.selected_accessories(accessories_hash)
     selected_accessories = Array.new
@@ -22,7 +22,7 @@ def self.selected_accessories(accessories_hash)
         accessory = Product.find(k.to_i)
         selected_accessories << accessory
       end
-    end  
+    end
     selected_accessories
-  end   
+  end
 end
\ No newline at end of file
diff --git a/app/models/product_option_instance.rb b/app/models/product_option_instance.rb
index 72ba0d0..04a7c7d 100644
--- a/app/models/product_option_instance.rb
+++ b/app/models/product_option_instance.rb
@@ -1,13 +1,13 @@
 class ProductOptionInstance < ActiveRecord::Base
-  belongs_to :product_option  
+  belongs_to :product_option
   belongs_to :product
-  
+
   after_create :regenerate_product_variants
   after_destroy :regenerate_product_variants
-  
-  
+
+
   def regenerate_product_variants
     self.product.generate_variants
   end
-  
+
 end
diff --git a/app/models/product_option_selection.rb b/app/models/product_option_selection.rb
index 67665ca..a33370c 100644
--- a/app/models/product_option_selection.rb
+++ b/app/models/product_option_selection.rb
@@ -2,22 +2,22 @@ class ProductOptionSelection < ActiveRecord::Base
   belongs_to :product_option
   has_many :variant_selections
   has_many :variants, :through => :variant_selections, :dependent => :destroy
-  
+
   has_many :images, :class_name => 'ProductOptionSelectionImage'
-  
+
   after_create :generate_product_variants
   after_update :update_variants
-  
-  
-  def product 
+
+
+  def product
     self.product_option.products.first
-  end 
-  
+  end
+
   ##
   # generates all the selection variation variants for the selection's product
   def generate_product_variants
     # the associated product does not yet exist when the product option is first created
-    # we do not want to generate variants in such a case since they will be created by the 
+    # we do not want to generate variants in such a case since they will be created by the
     # product_option_instance callback later
     unless product.nil?
       selection_id_arrays = [[self.id]]
@@ -28,16 +28,16 @@ def generate_product_variants
       product.generate_variants_from_selection_ids(selection_id_arrays)
     end
   end
- 
+
   ##
   # updates the weight and price of the selection's variants if the adjustments have changed
   def update_variants
-    if price_adjustment_changed?  
+    if price_adjustment_changed?
       self.variants.each {|v| v.update_price}
     end
     if weight_adjustment_changed?
       self.variants.each {|v| v.update_weight}
     end
   end
-  
+
 end
diff --git a/app/models/product_variant.rb b/app/models/product_variant.rb
index 9171e76..85d8e44 100644
--- a/app/models/product_variant.rb
+++ b/app/models/product_variant.rb
@@ -9,7 +9,7 @@ module ProductVariant
   def has_variants
     !self.variants.empty?
   end
-  
+
   ##
   # Returns either the price of the product or for the first variant as ordered by product_options'
   # selections' default order
@@ -22,7 +22,7 @@ def product_or_first_variant_price
       price
     end
   end
-  
+
   ##
   # Returns first variant as ordered by product_options' selections' default order
   #
@@ -31,7 +31,7 @@ def first_variant
     selection_ids = self.product_options.map { |o| o.product_option_selections.first.id }
     find_variant_by_selection_ids(selection_ids)
   end
-    
+
   ##
   # Returns variant which associates with the Array of product_option_selection ids
   #
@@ -40,7 +40,7 @@ def first_variant
   def find_variant_by_selection_ids(selection_ids)
     self.variants.detect{ |v| v.product_option_selection_ids.sort == selection_ids.sort } if selection_ids
   end
-        
+
 
   ##
   # Regenerates all the variants for the product
@@ -53,7 +53,7 @@ def generate_variants
     end
     generate_variants_from_selection_ids(selection_id_arrays)
   end
-  
+
   ##
   # Generates variants from the array list of selection ids
   #
@@ -64,7 +64,7 @@ def generate_variants_from_selection_ids(selection_id_arrays)
       generate_variant(variant_selection_ids)
     end
   end
-  
+
   ##
   # Generates an variant and the relations to its product_option_selections
   #
@@ -73,19 +73,19 @@ def generate_variant(selection_ids)
     selections = ProductOptionSelection.find(selection_ids)
     variant_price = self.price + selections.inject(0){|sum, s| sum + s.price_adjustment }
     variant_weight = (self.weight || 0) + selections.inject(0){|sum, s| sum + s.weight_adjustment }
-    variant = self.variants.create(:price => variant_price, :weight => variant_weight, 
+    variant = self.variants.create(:price => variant_price, :weight => variant_weight,
                                    :inventory => 0, :sku => self.sku)
     selections.each do |s|
       s.variants << variant
     end
   end
 
-private 
-  
+private
+
   ##
   # Generates an array of array objects that are a cartesian product of a list of array objects
   # e.g. [1,2], [3,4], [5,6]=> [[1,3,5],[1,3,6],[1,4,5],[1,4,6],[2,3,5],[2,3,6],[2,4,5],[2,4,6]]
-  # 
+  #
   # @param [Array] args a variable amount of Arrays for the cartesian product
   def cartprod(*args)
     result = [[]]
diff --git a/app/models/promo_code.rb b/app/models/promo_code.rb
index 56a8589..10778d1 100644
--- a/app/models/promo_code.rb
+++ b/app/models/promo_code.rb
@@ -2,49 +2,49 @@
 class PromoCode < ActiveRecord::Base
   validates_presence_of :name
   validates_presence_of :code
-  
-  attr_accessor :message 
-  
+
+  attr_accessor :message
+
   SUCCESS_MESSAGE = "Promo Code successfully applied, enjoy."
   NOT_APPLIED_MESSAGE = "Promo Code not applied."
   MINIMUM_AMOUNT_MESSAGE = "Your order did not reach the minimum amount required of "
   INVALID_MESSAGE = "This is not a valid promo code, please check and reapply."
- 
+
   # apply a specific promo code to an order
   def self.apply(order, promo_code)
     begin
-      promo_code = promo_code.upcase 
+      promo_code = promo_code.upcase
       promo = PromoCode.find_by_code(promo_code)
     rescue
       order.promo_code = ''
       order.free_shipping = false
       order.promo_discount = ''
       order.save!
-    end 
+    end
     if promo
       promo.apply(order)
     else
       promo = PromoCode.new
       promo.message = INVALID_MESSAGE
     end
-     
+
     promo
   end
-   
+
   # apply the promo code to a particular order
   def apply(order)
     self.message = INVALID_MESSAGE
-    
+
     if order.sub_total >= self.minimum_order_amount
       # order is the minimum amount
       if self.percent_discount && self.percent_discount > 0
         discount = self.calculate_percent_discount(order)
       else
-        discount = self.dollar_discount 
+        discount = self.dollar_discount
       end
       discount ||= 0
       self.message = SUCCESS_MESSAGE
-    
+
       if order
         order.promo_code = self.code.upcase
         order.free_shipping = true if self.free_shipping
@@ -54,17 +54,17 @@ def apply(order)
     else
       self.message = minimum_amount_required_message
     end
-    
+
     self.message
   end
-  
+
   def calculate_percent_discount(order)
     (self.percent_discount / 100) * order.product_total
   end
-   
+
   def minimum_amount_required_message
     MINIMUM_AMOUNT_MESSAGE + '$' + self.minimum_order_amount.to_s
   end
-  
-   
+
+
 end
diff --git a/app/models/region.rb b/app/models/region.rb
index 743d66c..2990661 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -1,12 +1,12 @@
 class Region < ActiveRecord::Base
   has_many :shipping_methods
-  
+
    # couldn't get :first to work right with has_finder
-  #has_finder :default_method, 
+  #has_finder :default_method,
   #           :conditions => { :default_selection => true }
-  
+
   def default_shipping_method
     shipping_methods.find(:first, :conditions => { :default_selection => true })
   end
-  
+
 end
diff --git a/app/models/shipping_method.rb b/app/models/shipping_method.rb
index f4de74d..82a731b 100644
--- a/app/models/shipping_method.rb
+++ b/app/models/shipping_method.rb
@@ -15,7 +15,7 @@ class ShippingMethod < ActiveRecord::Base
   def is_base_rate?
     !(GeneralConfiguration.shipping_calculated_by_weight? || is_order_range_flat_rated?)
   end
-  
+
   def is_order_range_flat_rated?
     flat_rate_shippings.select{|rate| !rate.new_record? }.size > 0
   end
diff --git a/app/models/shipping_provider.rb b/app/models/shipping_provider.rb
index 358aec4..d9b875a 100644
--- a/app/models/shipping_provider.rb
+++ b/app/models/shipping_provider.rb
@@ -1,7 +1,7 @@
-# currently not used 
+# currently not used
 class ShippingProvider < ActiveRecord::Base
   belongs_to :shipping_rate
-  
+
   has_one :flat_rate_shipping
-  
+
 end
diff --git a/app/models/tax_rate.rb b/app/models/tax_rate.rb
index 5a1056c..80c5244 100644
--- a/app/models/tax_rate.rb
+++ b/app/models/tax_rate.rb
@@ -1,5 +1,5 @@
 class TaxRate < ActiveRecord::Base
-  
+
   def self.calculate_tax(state, sub_total)
     t = 0
     taxrate = TaxRate.find_by_state(state)
diff --git a/app/models/user.rb b/app/models/user.rb
index 42453c8..c13f825 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -17,14 +17,14 @@ class User < ActiveRecord::Base
   # anything else you want your user to change should be added here.
   attr_accessible :login, :email, :password, :password_confirmation
   attr_accessible :role
-  
-  # has_role? simply needs to return true or false whether a user has a role or not.  
+
+  # has_role? simply needs to return true or false whether a user has a role or not.
   # It may be a good idea to have "admin" roles return true always
   def has_role?(role_in_question)
     return true if self.role=="admin"
     self.role == role_in_question.to_s
   end
-  
+
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password)
     u = find_by_login(login) # need to get the salt
@@ -46,7 +46,7 @@ def authenticated?(password)
   end
 
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
 
   # These create and unset the fields required for remembering users between browser closes
@@ -63,13 +63,13 @@ def forget_me
   end
 
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
       self.crypted_password = encrypt(password)
     end
-    
+
     def password_required?
       crypted_password.blank? || !password.blank?
     end
diff --git a/app/models/variant.rb b/app/models/variant.rb
index c3f48a4..8304a27 100644
--- a/app/models/variant.rb
+++ b/app/models/variant.rb
@@ -1,23 +1,23 @@
 class Variant < ActiveRecord::Base
   belongs_to :product
-  
+
   has_many :variant_selections
   has_many :product_option_selections, :through => :variant_selections,
            :order => 'product_option_id'
   has_many :cart_items
   has_many :order_items
-  
+
   belongs_to :variant_image, :dependent => :destroy
-  
+
   default_scope :order => :id
-  
-  
+
+
   validates_numericality_of :weight, :greater_than_or_equal_to => 0
   validates_numericality_of :price, :greater_than => 0
-  validates_numericality_of :inventory, :only_integer => true, :greater_than_or_equal_to => 0 
-  
+  validates_numericality_of :inventory, :only_integer => true, :greater_than_or_equal_to => 0
+
   ##
-  # updates the weight of the variant by combining product weight with the sum of the 
+  # updates the weight of the variant by combining product weight with the sum of the
   # adjustments of its option selections
   def update_weight
     self.weight = product.weight + product_option_selections.inject(0){|sum, s| sum + s.weight_adjustment }
@@ -25,13 +25,13 @@ def update_weight
   end
 
   ##
-  # updates the price of the variant by combining product price with the sum of the 
+  # updates the price of the variant by combining product price with the sum of the
   # adjustments of its option selections
   def update_price
     self.price = product.price + product_option_selections.inject(0){|sum, s| sum + s.price_adjustment }
     self.save!
   end
-    
+
   def out_of_stock_check
     if GeneralConfiguration.instance.inventory_management
       self.inventory <= 0
@@ -39,5 +39,5 @@ def out_of_stock_check
       self.out_of_stock
     end
   end
-  
+
 end
diff --git a/app/models/variant_image.rb b/app/models/variant_image.rb
index 97f27f0..cdbc844 100644
--- a/app/models/variant_image.rb
+++ b/app/models/variant_image.rb
@@ -1,21 +1,21 @@
 class VariantImage < ActiveRecord::Base
   has_many :variants, :dependent => :nullify
-  
+
   has_one :variant_image_thumbnail, :dependent => :destroy
   has_one :variant_large_image, :dependent => :destroy
 
   mount_uploader :filename, ImageUploader
-  
+
   def product
     variants.first.product
   end
-  
+
   ##
   # The url for the variant image.
   #
-  # @return [String] The image url for the variant or an empty string if one doesn't exist.  
+  # @return [String] The image url for the variant or an empty string if one doesn't exist.
   def image_url
-    self.filename.url 
+    self.filename.url
   end
 
   ##
@@ -30,7 +30,7 @@ def thumbnail_url
   ##
   # The url for the variant large image.
   #
-  # @return [String] The url of the large variant or empty string if one doesn't exist. 
+  # @return [String] The url of the large variant or empty string if one doesn't exist.
   def large_image_url
     return '' if self.variant_large_image.blank?
     self.variant_large_image.filename.url
diff --git a/app/notifiers/contact_notifier.rb b/app/notifiers/contact_notifier.rb
index 2de8b69..95c209c 100644
--- a/app/notifiers/contact_notifier.rb
+++ b/app/notifiers/contact_notifier.rb
@@ -1,5 +1,5 @@
 class ContactNotifier < ActionMailer::Base
-  
+
   def contact_confirmation(name, email, phone, extension, comment)
     recipients APP_CONFIG['support_email']
     from APP_CONFIG['contact_email']
@@ -8,6 +8,6 @@ def contact_confirmation(name, email, phone, extension, comment)
     content_type "text/html"
     body :name => name, :email => email, :phone => phone,
          :extension => extension, :comment => comment
-  end 
-  
+  end
+
 end
\ No newline at end of file
diff --git a/app/reports/order_report.rb b/app/reports/order_report.rb
index b9623b9..6538846 100644
--- a/app/reports/order_report.rb
+++ b/app/reports/order_report.rb
@@ -1,23 +1,23 @@
 class OrderReport < Ruport::Controller
-  
+
   stage :list
 
   def setup
-    start_date = options.start_date.empty? ? 
-                  Date.parse('2007-01-01') : 
+    start_date = options.start_date.empty? ?
+                  Date.parse('2007-01-01') :
                   Date.parse(options.start_date)
-    end_date = options.end_date.empty? ? 
+    end_date = options.end_date.empty? ?
                   Date.today :
                   Date.parse(options.end_date)
     # create range string to grab orders
     range = "created_at #{(start_date..end_date).to_s(:db)}"
-    
-    self.data = Order.report_table(:all, 
+
+    self.data = Order.report_table(:all,
                                    :only => ['created_at', 'order_number', 'full_name',
                                              'business', 'product_cost', 'shipping_cost'],
                                    :methods => [:total],
                                    :include =>
-                                     { 
+                                     {
                                        :shipping_address => { :only => ['state', 'country'] },
                                        :order_items => { :only => ['product_name', 'quantity'],
                                                          :include => {
@@ -30,17 +30,17 @@ def setup
                                                    "fulfilled"])
     if self.data.size > 0
       self.data.reorder('created_at', 'order_number', 'full_name', 'business', 'shipping_address.state',
-                  'shipping_address.country', 'product_cost', 'shipping_cost', 
-                  'total','order_items.quantity',  'product.sku', 
+                  'shipping_address.country', 'product_cost', 'shipping_cost',
+                  'total','order_items.quantity',  'product.sku',
                   'order_items.product_name')
     end
     self.data.rename_columns('created_at' => 'Order Date', 'order_number' => 'Order Number',
                         'full_name' => 'Full Name',
                         'business' => 'Company', 'product_cost' => 'SubTotal',
                         'shipping_cost' => 'Shipping Cost',
-                        'product.sku' => 'Sku', 
+                        'product.sku' => 'Sku',
                         'total' => 'Total',
-                        'order_items.product_name' => 'Product Name', 
+                        'order_items.product_name' => 'Product Name',
                         'order_items.quantity' => 'Quantity',
                         'shipping_address.country' => 'Country',
                         'shipping_address.state' => 'State')
@@ -54,18 +54,18 @@ def setup
       output << '</div>'
     end
   end
-  
+
   formatter :pdf do
     build :list do
       pad(10) { add_text "Orders" }
       draw_table data
     end
   end
-  
+
   formatter :csv do
     build :list do
       output << data.to_csv
     end
   end
-  
+
 end
diff --git a/app/views/admin/accessories/_category_selection.html.erb b/app/views/admin/accessories/_category_selection.html.erb
index 32a3913..4fb219d 100644
--- a/app/views/admin/accessories/_category_selection.html.erb
+++ b/app/views/admin/accessories/_category_selection.html.erb
@@ -1,11 +1,11 @@
-<% form_tag(admin_product_accessory_path(@product), :id => 'category_selection_form') do |f| %>	
+<% form_tag(admin_product_accessory_path(@product), :id => 'category_selection_form') do |f| %>
 
   <select id="category_selector" size="20" name="category_id" class=".selector">
     <% for category in @categories %>
       <option value="<%= category.id %>">
-        <% (category.level - 1).times do %> 
+        <% (category.level - 1).times do %>
           --
-        <% end %>	
+        <% end %>
         <%= category.name %>
       </option>
     <% end %>
diff --git a/app/views/admin/accessories/_product_accessory.html.erb b/app/views/admin/accessories/_product_accessory.html.erb
index 6478ac8..b3ad9a4 100644
--- a/app/views/admin/accessories/_product_accessory.html.erb
+++ b/app/views/admin/accessories/_product_accessory.html.erb
@@ -11,6 +11,6 @@
     <%= link_to "Remove", admin_product_accessory_path(@product, product_accessory),
                     :class => 'accessory_destroy' %>
  <% end %>
- 
-    
+
+
 </div>
\ No newline at end of file
diff --git a/app/views/admin/accessories/_product_list.html.erb b/app/views/admin/accessories/_product_list.html.erb
index 7cebd06..0c8af98 100644
--- a/app/views/admin/accessories/_product_list.html.erb
+++ b/app/views/admin/accessories/_product_list.html.erb
@@ -1,5 +1,5 @@
 <select id="product_selector" size="20" name = "accessory_id" class=".selector">
-  <% for product in @products %> 
+  <% for product in @products %>
     <option value="<%= product.id %>">
       <%= product.name %>
     </option>
@@ -8,4 +8,3 @@
 
 <%= link_to 'add accessory', admin_product_accessories_path(@product), :id => 'add_accessory_link' %>
 
-  
\ No newline at end of file
diff --git a/app/views/admin/accessories/edit.html.erb b/app/views/admin/accessories/edit.html.erb
index 200827a..cfe3756 100644
--- a/app/views/admin/accessories/edit.html.erb
+++ b/app/views/admin/accessories/edit.html.erb
@@ -9,7 +9,7 @@ Select Category of accessory to add <br/>
 
 <div id='product_list'>
 </div>
-  
+
 <div id='accessories'>
   <%= render :partial =>'accessories' %>
 </div>
diff --git a/app/views/admin/accessories/show.rjs b/app/views/admin/accessories/show.rjs
index e4ea79b..935f90a 100644
--- a/app/views/admin/accessories/show.rjs
+++ b/app/views/admin/accessories/show.rjs
@@ -1 +1 @@
-page[:product_list].replace_html :partial => 'product_list' 
+page[:product_list].replace_html :partial => 'product_list'
diff --git a/app/views/admin/authorizations/update.rjs b/app/views/admin/authorizations/update.rjs
index 83cfdc8..9d5cbc4 100644
--- a/app/views/admin/authorizations/update.rjs
+++ b/app/views/admin/authorizations/update.rjs
@@ -1,4 +1,4 @@
- 
+
 page[:post_authorize].hide
-page[:order_transactions].replace_html :partial => 'admin/orders/order_transactions', 
+page[:order_transactions].replace_html :partial => 'admin/orders/order_transactions',
 			                                 :object => @order
\ No newline at end of file
diff --git a/app/views/admin/categories/_category_selection.html.erb b/app/views/admin/categories/_category_selection.html.erb
index 4abdb1f..f81b179 100644
--- a/app/views/admin/categories/_category_selection.html.erb
+++ b/app/views/admin/categories/_category_selection.html.erb
@@ -1,22 +1,22 @@
 
 	<select id="category_selector" size="80"
-			onchange="<%= remote_function(:update => 'category_edit', 
-										  :url => { :action => "setup_edit_category" }, 
+			onchange="<%= remote_function(:update => 'category_edit',
+										  :url => { :action => "setup_edit_category" },
 									      :submit => 'category_selection') %>;return false;"
 	 		name="category_selector">
-	
+
 		<% for category in @categories %>
 			<option value="<%= category.id %>">
-		   	<% category.level.times do %> 
+		   	<% category.level.times do %>
 		 			&nbsp;&nbsp;
-				<% end %>	
+				<% end %>
 				<%= category.name %>
 			</option>
 		<% end %>
-	
-	
+
+
 	</select>
-	
+
 	<br/>
 	<br/>
 
diff --git a/app/views/admin/categories/_icon_form.html.erb b/app/views/admin/categories/_icon_form.html.erb
index 3a400b1..f063299 100644
--- a/app/views/admin/categories/_icon_form.html.erb
+++ b/app/views/admin/categories/_icon_form.html.erb
@@ -1,5 +1,5 @@
 <div style="display:inline">
-	
+
 	<% form_for [:admin, category, CategoryIcon.new],
               :html => { :multipart => true, :id => 'category_icon_add' } do |form| %>
 	  <p>
diff --git a/app/views/admin/categories/_icon_hover.html.erb b/app/views/admin/categories/_icon_hover.html.erb
index 4b3d530..8f43141 100644
--- a/app/views/admin/categories/_icon_hover.html.erb
+++ b/app/views/admin/categories/_icon_hover.html.erb
@@ -1,7 +1,7 @@
 <% if icon.category_icon_hover %>
   <div style="display:inline">
   	<%= image_tag icon.category_icon_hover.filename.url %>
-  	<%= link_to 'Remove Image', admin_category_icon_category_icon_hover_path(icon, icon.category_icon_hover), 
+  	<%= link_to 'Remove Image', admin_category_icon_category_icon_hover_path(icon, icon.category_icon_hover),
   	    :id => "destroy-category-icon-hover" %>
   </div>
 <% else %>
diff --git a/app/views/admin/categories/_icon_list.html.erb b/app/views/admin/categories/_icon_list.html.erb
index 7539347..8b8ce69 100644
--- a/app/views/admin/categories/_icon_list.html.erb
+++ b/app/views/admin/categories/_icon_list.html.erb
@@ -1,6 +1,6 @@
 <div style="display:inline">
 	<%= image_tag icon.filename.url %>
-	<%= link_to 'Remove Image', admin_category_category_icon_path(category, icon), 
+	<%= link_to 'Remove Image', admin_category_category_icon_path(category, icon),
 	    :class => "destroy-category-icon" %>
 </div>
 <br/><br/>
diff --git a/app/views/admin/categories/_image_form.html.erb b/app/views/admin/categories/_image_form.html.erb
index a3a9ebb..92699f3 100644
--- a/app/views/admin/categories/_image_form.html.erb
+++ b/app/views/admin/categories/_image_form.html.erb
@@ -1,5 +1,5 @@
 <div id="images_form" style="display:inline">
-	
+
 	<% form_for [:admin, category, CategoryImage.new],
               :html => { :multipart => true, :id => 'category_image_add' } do |form| %>
 	  <p>
diff --git a/app/views/admin/categories/_image_list.html.erb b/app/views/admin/categories/_image_list.html.erb
index 47d5833..510e5d2 100644
--- a/app/views/admin/categories/_image_list.html.erb
+++ b/app/views/admin/categories/_image_list.html.erb
@@ -4,7 +4,7 @@
   <% category.category_images.each do |image| %>
   	<div style="display:inline">
   		<%= image_tag image.filename.url %>
-  		<%= link_to 'Remove Image', admin_category_category_image_path(category, image), 
+  		<%= link_to 'Remove Image', admin_category_category_image_path(category, image),
   		    :class => "destroy-category-image" %>
   	</div>
   <% end %>
diff --git a/app/views/admin/categories/edit.html.erb b/app/views/admin/categories/edit.html.erb
index 0e8b289..ca6bc61 100644
--- a/app/views/admin/categories/edit.html.erb
+++ b/app/views/admin/categories/edit.html.erb
@@ -1,6 +1,6 @@
 <%= javascript('pebbles/jquery/form', 'pebbles/jquery/livequery') %>
 
-<%= link_to "Delete the Category '#{@category.name}'", admin_category_path(@category), 
+<%= link_to "Delete the Category '#{@category.name}'", admin_category_path(@category),
       :confirm => "Are you sure you want to delete the category #{@category.name}?", :method => :delete %>
 <br/><br/>
 <%= render 'form', :category => @category %>
diff --git a/app/views/admin/configurations/_details.html.erb b/app/views/admin/configurations/_details.html.erb
index 8ef2035..6548ebb 100644
--- a/app/views/admin/configurations/_details.html.erb
+++ b/app/views/admin/configurations/_details.html.erb
@@ -3,7 +3,7 @@
 <% form_for :configuration, @configuration, :url => admin_configuration_path(1), :html => { :method => :put }  do |form| %>
   <p>
   <label for="shipping_configuration">Shipping Configuration *:</label>
-  <%= form.select :shipping_type || 1, ShippingType::CONFIGURATION_SHIPPING_TYPES.invert %><br/>	
+  <%= form.select :shipping_type || 1, ShippingType::CONFIGURATION_SHIPPING_TYPES.invert %><br/>
   <%= submit_tag "Update" %>
  </p>
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/configurations/edit.html.erb b/app/views/admin/configurations/edit.html.erb
index 271448e..392b1e1 100644
--- a/app/views/admin/configurations/edit.html.erb
+++ b/app/views/admin/configurations/edit.html.erb
@@ -13,7 +13,7 @@
       <div id="p7tpc1_1">
         <h4>Details</h4>
         <%= render :partial => "details", :locals => { :configuration => @configuration}%>
-      </div>  
+      </div>
     </div>
   </div>
   <!--[if lte IE 6]>
@@ -24,4 +24,4 @@
     <![endif]-->
 </div>
 
-<%= link_to 'Show', admin_configurations_path %> 
+<%= link_to 'Show', admin_configurations_path %>
diff --git a/app/views/admin/optimizations/_details.html.erb b/app/views/admin/optimizations/_details.html.erb
index f32be1e..c50cd23 100644
--- a/app/views/admin/optimizations/_details.html.erb
+++ b/app/views/admin/optimizations/_details.html.erb
@@ -3,7 +3,7 @@
 <% form_for :optimization, @optimization, :url => admin_optimization_path(1), :html => { :method => :put }  do |form| %>
   <p>
     <label for="name">Title *:</label>
-    <%= form.text_field :title, :size => 20 %><br/>	
+    <%= form.text_field :title, :size => 20 %><br/>
     <label for="description">Keywords:</label>
     <%= form.text_area :keywords, :rows => 10 %><br/>
     <label for="description">Description:</label>
diff --git a/app/views/admin/optimizations/edit.html.erb b/app/views/admin/optimizations/edit.html.erb
index 464b75d..bc0a010 100644
--- a/app/views/admin/optimizations/edit.html.erb
+++ b/app/views/admin/optimizations/edit.html.erb
@@ -13,7 +13,7 @@
       <div id="p7tpc1_1">
         <h4>Details</h4>
         <%= render :partial => "details", :locals => { :optimization => @optimization}%>
-      </div>  
+      </div>
     </div>
   </div>
   <!--[if lte IE 6]>
@@ -24,4 +24,4 @@
     <![endif]-->
 </div>
 
-<%= link_to 'Show', admin_optimizations_path %> 
+<%= link_to 'Show', admin_optimizations_path %>
diff --git a/app/views/admin/order_items/destroy.rjs b/app/views/admin/order_items/destroy.rjs
index 11c1651..b296aa0 100644
--- a/app/views/admin/order_items/destroy.rjs
+++ b/app/views/admin/order_items/destroy.rjs
@@ -1,7 +1,7 @@
 
-page[:order_totals].replace_html :partial => "admin/orders/order_totals", 
+page[:order_totals].replace_html :partial => "admin/orders/order_totals",
 			                           :object => @order
 
-		                           
-page[:order_items].replace_html :partial => "admin/orders/edit_order_items", 
-			                          :object => @order 
+
+page[:order_items].replace_html :partial => "admin/orders/edit_order_items",
+			                          :object => @order
diff --git a/app/views/admin/order_items/update.rjs b/app/views/admin/order_items/update.rjs
index f2159bb..cb6c045 100644
--- a/app/views/admin/order_items/update.rjs
+++ b/app/views/admin/order_items/update.rjs
@@ -1,6 +1,6 @@
 
-page[:order_totals].replace_html :partial => "admin/orders/order_totals", 
+page[:order_totals].replace_html :partial => "admin/orders/order_totals",
 			                           :object => @order
-			                           
-page[:order_items].replace_html :partial => "admin/orders/edit_order_items", 
-			                          :object => @order 
+
+page[:order_items].replace_html :partial => "admin/orders/edit_order_items",
+			                          :object => @order
diff --git a/app/views/admin/orders/_delivery_status.html.erb b/app/views/admin/orders/_delivery_status.html.erb
index aee75e7..63dc130 100644
--- a/app/views/admin/orders/_delivery_status.html.erb
+++ b/app/views/admin/orders/_delivery_status.html.erb
@@ -1,6 +1,6 @@
 
  <input type='hidden' name='id' value='<%= order.id %>' class="hidden_order_id">
   <%= select_tag( "delivery_status_#{order.id}",
- 				  options_for_select(OrderDeliveryStatus::LIST, order.delivery_status), 
+ 				  options_for_select(OrderDeliveryStatus::LIST, order.delivery_status),
  				  :class => "delivery_status" ) %>
 </span>
diff --git a/app/views/admin/orders/_edit_order_items.html.erb b/app/views/admin/orders/_edit_order_items.html.erb
index 025e513..784a4e4 100644
--- a/app/views/admin/orders/_edit_order_items.html.erb
+++ b/app/views/admin/orders/_edit_order_items.html.erb
@@ -16,9 +16,9 @@
 		<tr>
 			<td id='<%= dom_id(order_item) %>' >
 				<%= text_field_tag 'quantity', order_item.quantity.to_s, :size => 3 %>
-			    <%= link_to_remote 'Update', 
-								{ :url => admin_order_item_path(order_item), 
-								  :method => :put, 
+			    <%= link_to_remote 'Update',
+								{ :url => admin_order_item_path(order_item),
+								  :method => :put,
 								  :submit => dom_id(order_item) } %>
 			</td>
 			<td>
@@ -36,9 +36,9 @@
 			<td class='total-value' style='display:table-cell'>
 				<%= number_to_currency(order_item.price * order_item.quantity) %>
 			</td>
-        <td><%= link_to_remote 'Remove', 
-						{ :url => admin_order_item_path(order_item), 
-						:confirm => "Are you sure you want to remove #{order_item.product_name}?", 
+        <td><%= link_to_remote 'Remove',
+						{ :url => admin_order_item_path(order_item),
+						:confirm => "Are you sure you want to remove #{order_item.product_name}?",
 						:method => :delete } %></td>
 		</tr>
 		<% end %>
@@ -47,5 +47,5 @@
 		<b>SubTotal:</b> <%= number_to_currency(@order.product_cost) %><br/>
 	</div>
 </div>
-  
+
 
diff --git a/app/views/admin/orders/_order_transactions.html.erb b/app/views/admin/orders/_order_transactions.html.erb
index b8b5e4f..37decc1 100644
--- a/app/views/admin/orders/_order_transactions.html.erb
+++ b/app/views/admin/orders/_order_transactions.html.erb
@@ -3,7 +3,7 @@
   <b class='print-hide'>Transactions</b><br/>
   <div class="gt-table-controls clearfix print-hide">
     <table class="gt-list-table print-hide">
-    <tr> 
+    <tr>
       <th>Action</th>
       <th>Amount</th>
       <th>Success</th>
diff --git a/app/views/admin/orders/edit.html.erb b/app/views/admin/orders/edit.html.erb
index 9d62916..b7d6de0 100644
--- a/app/views/admin/orders/edit.html.erb
+++ b/app/views/admin/orders/edit.html.erb
@@ -59,7 +59,7 @@
                 <%= @order.billing_address.address_1 %><br/>
                 <%= @order.billing_address.address_2 -%>
                 <%= content_tag('br/') unless @order.billing_address.address_2.blank? %>
-                <%= @order.billing_address.city %>, 
+                <%= @order.billing_address.city %>,
                 <%= @order.billing_address.state %>&nbsp;
                 <%= @order.billing_address.postal_code %><br/>
                 <%= @order.billing_address.country -%>
@@ -74,7 +74,7 @@
               <%= @order.shipping_address.address_1 %><br/>
               <%= @order.shipping_address.address_2 -%>
               <%= content_tag('br/') unless @order.shipping_address.address_2.blank? %>
-              <%= @order.shipping_address.city %>, 
+              <%= @order.shipping_address.city %>,
               <%= @order.shipping_address.state %>&nbsp;
               <%= @order.shipping_address.postal_code %><br/>
               <%= @order.shipping_address.country -%>
@@ -82,15 +82,15 @@
           </div>
           <hr/>
 
-          <div id="order_items"> 
+          <div id="order_items">
             <%= render :partial => 'edit_order_items' %>
           </div>
-          
+
           <br/>
-          <label><b>Shipping Method:</b></label>  
+          <label><b>Shipping Method:</b></label>
           <span><%= @order.shipping_method %></span>
           <br/>
-          
+
           <div id = "order_totals" >
             <%= render :partial => "order_totals" %>
           </div>
@@ -99,14 +99,14 @@
             <%= render :partial => "order_transactions" %>
           </div>
         </p>
-        <% form_for :order, :url => admin_order_path(@order),  
+        <% form_for :order, :url => admin_order_path(@order),
            :html => { :method => :put, :class => 'gt-form' } do |form| %>
-        <hr/>   
+        <hr/>
         <label class='print-hide' for="admin_notes">Notes:</label><br/>
         <%= form.text_area :admin_notes, :class => 'gt-form-text' %>
         <br/><br/>
         <%= image_submit_tag 'gt/btn-update.jpg', :class => 'gt-submit-btn' %>
-        or 
+        or
         <%= link_to 'Cancel', admin_order_path(@order) %>
 
 <% end %>
diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb
index d91ed3a..3906160 100644
--- a/app/views/admin/orders/show.html.erb
+++ b/app/views/admin/orders/show.html.erb
@@ -13,7 +13,7 @@
     </div>
     <div class="p7TPcontent">
       <div id="p7tpc1_1">
-  
+
   <p>
   <div style="float:left">
     <label for="delivery_number"><b>Order Number: </b></label>
@@ -57,7 +57,7 @@
         <%= @order.billing_address.address_1 %><br/>
         <%= @order.billing_address.address_2 -%>
         <%= content_tag('br/') unless @order.billing_address.address_2.blank? %>
-        <%= @order.billing_address.city %>, 
+        <%= @order.billing_address.city %>,
         <%= @order.billing_address.state %>&nbsp;
         <%= @order.billing_address.postal_code %><br/>
         <%= @order.billing_address.country -%>
@@ -71,18 +71,18 @@
       <%= @order.shipping_address.address_1 %><br/>
       <%= @order.shipping_address.address_2 -%>
       <%= content_tag('br/') unless @order.shipping_address.address_2.blank? %>
-      <%= @order.shipping_address.city %>, 
+      <%= @order.shipping_address.city %>,
       <%= @order.shipping_address.state %>&nbsp;
       <%= @order.shipping_address.postal_code %><br/>
       <%= @order.shipping_address.country -%>
     <% end %>
   </div>
-  
+
   <div style="clear:both"></div>
   <hr/>
   <%= render :partial => "order_items" %>
   <br/>
-  <label><b>Shipping Method:</b></label>  
+  <label><b>Shipping Method:</b></label>
   <span><%= @order.shipping_method %></span>
   <br/>
   <%= render :partial => "order_totals" %>
@@ -97,15 +97,15 @@
   <span class='print-hide'><%= @order.admin_notes %></span><br/><br/>
    </p>
   <hr/>
-  
+
   <div id='post_authorize'>
-    <%= render :partial => 'postauthorize', 
+    <%= render :partial => 'postauthorize',
            :locals => { :order => @order } %>
   </div>
   <div style="clear:both"></div>
 
   <%= link_to image_tag('gt/btn-edit.jpg'), edit_admin_order_path(@order), :class => 'print-hide' %>
-  
+
       </div>
     </div>
   </div>
diff --git a/app/views/admin/product_options/_option_list.html.erb b/app/views/admin/product_options/_option_list.html.erb
index 73ab082..5cd578f 100644
--- a/app/views/admin/product_options/_option_list.html.erb
+++ b/app/views/admin/product_options/_option_list.html.erb
@@ -21,16 +21,16 @@
 			<td>
 				<%= option.description %>
 			</td>
-			<td><%= link_to_remote "Edit",  
+			<td><%= link_to_remote "Edit",
 								:with => "'product_option_id=' + #{option.id}",
 								:method => 'get',
 								:url => { :action => 'edit',
 										  :controller => 'product_options',
 										  :id => product.id } %>
 			</td>
-		    <td><%= link_to_remote 'Remove', 
+		    <td><%= link_to_remote 'Remove',
 								:method => :delete,
-								:confirm => "Remove the option #{option.name}?", 
+								:confirm => "Remove the option #{option.name}?",
 								:url => admin_product_product_option_path(product, option) %></td>
 		 </tr>
 		<% end %>
@@ -38,4 +38,3 @@
 		</table>
 	</div>
 <% end %>
-    
\ No newline at end of file
diff --git a/app/views/admin/product_options/_option_selection_form.html.erb b/app/views/admin/product_options/_option_selection_form.html.erb
index 8cb287d..fbeaad9 100644
--- a/app/views/admin/product_options/_option_selection_form.html.erb
+++ b/app/views/admin/product_options/_option_selection_form.html.erb
@@ -2,31 +2,31 @@
 	<input type="hidden" name="product_option_id" value="<%= product_option.id %>">
 	<input type="hidden" name="product_id" value="<%= product.id %>">
 	<label>Selection Name:</label>
-	<%= option_selection.text_field :name, :size => 20, 
+	<%= option_selection.text_field :name, :size => 20,
 									:class => 'gt-form-text'   %><br/>
 	<label>Price Adjustment:</label>
-	<%= option_selection.text_field :price_adjustment, :size => 20, 
+	<%= option_selection.text_field :price_adjustment, :size => 20,
 									:class => 'gt-form-text'   %><br/>
 	<label>Weight Adjustment:</label>
-	<%= option_selection.text_field :weight_adjustment, :size => 20, 
+	<%= option_selection.text_field :weight_adjustment, :size => 20,
 									:class => 'gt-form-text'   %><br/>
 	<label>Sku:</label>
-	<%= option_selection.text_field :sku_adjustment, :size => 20, 
+	<%= option_selection.text_field :sku_adjustment, :size => 20,
 									:class => 'gt-form-text'   %><br/>
 <% end %>
 <% if product_option_selection.new_record? %>
 	<br/><br/>
-	<%= link_to_remote "Add New Selection", 
+	<%= link_to_remote "Add New Selection",
 						:submit => 'selection_form',
-						:url => { :action => 'add_option_selection', 
+						:url => { :action => 'add_option_selection',
 								  :controller => 'product_options' } %>
 <% else %>
 	<label for="image_upload">Image Upload:</label>
 	<%= render :partial => '/admin/product_options/option_selection_images',
 	 		   :locals => { :option_selection => product_option_selection } %>
 	<br/><br/>
-	<%= link_to_remote "Save Selection", 
+	<%= link_to_remote "Save Selection",
 						:submit => 'selection_form',
-						:url => { :action => 'edit_option_selection', 
+						:url => { :action => 'edit_option_selection',
 								  :controller => 'product_options' } %>
 <% end %>
diff --git a/app/views/admin/product_options/_option_selection_image_form.html.erb b/app/views/admin/product_options/_option_selection_image_form.html.erb
index 15d6592..f276b6a 100644
--- a/app/views/admin/product_options/_option_selection_image_form.html.erb
+++ b/app/views/admin/product_options/_option_selection_image_form.html.erb
@@ -1,8 +1,8 @@
 <div id="images_form" style="display:inline">
-	<% form_for :option_selection_image, 
-				:url => { :action => 'add_option_selection_image', 	
+	<% form_for :option_selection_image,
+				:url => { :action => 'add_option_selection_image',
 						  :controller => 'product_options',
-						  :id => option_selection.id }, 
+						  :id => option_selection.id },
 	            :html => { :multipart => true, :target => 'option_upload_frame' } do |form| %>
 	    <%= form.file_field :uploaded_data, :value => "Browse", :size => 15 %>
 		<br/>
diff --git a/app/views/admin/product_options/_option_selection_image_list.html.erb b/app/views/admin/product_options/_option_selection_image_list.html.erb
index c6dfb90..29b4003 100644
--- a/app/views/admin/product_options/_option_selection_image_list.html.erb
+++ b/app/views/admin/product_options/_option_selection_image_list.html.erb
@@ -3,10 +3,10 @@
 	<div id="<%= dom_id(image, 'id') %>" style="display:inline">
 		<%= image_tag image.filename.url, :name => "image_id" %>
 		<input type="hidden" name="image_id" value="<%= image.id %>"/>
-		<%= link_to_remote 'Remove Image', :submit => dom_id(image, 'id'), 
+		<%= link_to_remote 'Remove Image', :submit => dom_id(image, 'id'),
 							:update => 'image_list',
-							:confirm => "Are you sure you want to remove the image?", 
-							:url => { :action => 'remove_option_selection_image', 
+							:confirm => "Are you sure you want to remove the image?",
+							:url => { :action => 'remove_option_selection_image',
 									  :id => option_selection.id } %>
 	</div>
 <% end %>
diff --git a/app/views/admin/product_options/_option_selection_images.html.erb b/app/views/admin/product_options/_option_selection_images.html.erb
index 05c543c..a99c288 100644
--- a/app/views/admin/product_options/_option_selection_images.html.erb
+++ b/app/views/admin/product_options/_option_selection_images.html.erb
@@ -1,8 +1,8 @@
 
 <%= error_messages_for :option_selection_image %>
-<%= render :partial => '/admin/product_options/option_selection_image_form', 
+<%= render :partial => '/admin/product_options/option_selection_image_form',
 		   :locals => { :option_selection => option_selection } -%>
 <div id="image_list">
-	<%= render :partial => '/admin/product_options/option_selection_image_list', 
+	<%= render :partial => '/admin/product_options/option_selection_image_list',
 			   :locals => { :option_selection => option_selection } -%>
 </div>
diff --git a/app/views/admin/product_options/_option_selection_list.html.erb b/app/views/admin/product_options/_option_selection_list.html.erb
index 5960227..74b33ca 100644
--- a/app/views/admin/product_options/_option_selection_list.html.erb
+++ b/app/views/admin/product_options/_option_selection_list.html.erb
@@ -1,4 +1,4 @@
-<% if product_option.product_option_selections.size > 0 %>	
+<% if product_option.product_option_selections.size > 0 %>
 	<hr class="dotted_border">
 	<h3>Current Selections:</h3><br/>
 	<!-- May not be the most efficient, updating a single row in a table was acting odd -->
@@ -24,15 +24,15 @@
 		<td>
 			<%= selection.sku_adjustment %>
 		</td>
-		<td><%= link_to_remote "Edit",  
+		<td><%= link_to_remote "Edit",
 							:with => "'product_option_id=' + #{product_option.id} + '&product_id=' + #{product.id}",
 							:method => 'get',
 							:url => { :action => 'edit_option_selection',
 									  :controller => 'product_options',
 									  :id => selection.id } %>
 		</td>
-	    <td><%= link_to_remote 'Remove', :submit => dom_id(selection, 'id'), 
-							:confirm => "Are you sure you want to remove the option #{selection.name}", 
+	    <td><%= link_to_remote 'Remove', :submit => dom_id(selection, 'id'),
+							:confirm => "Are you sure you want to remove the option #{selection.name}",
 							:url => { :action => 'remove_option_selection' } %></td>
 	 </tr>
 	<% end %>
diff --git a/app/views/admin/product_options/_product_option_select.html.erb b/app/views/admin/product_options/_product_option_select.html.erb
index 90b9a28..a487b59 100644
--- a/app/views/admin/product_options/_product_option_select.html.erb
+++ b/app/views/admin/product_options/_product_option_select.html.erb
@@ -1,6 +1,6 @@
-<%= collection_select 'product_option', :id, available_options, 
-				  	  :id, :name %> 
-<%= link_to_remote "Select Option",  
+<%= collection_select 'product_option', :id, available_options,
+				  	  :id, :name %>
+<%= link_to_remote "Select Option",
 					:submit => 'product_option_select',
 					:method => 'get',
 					:url => { :action => 'edit',
diff --git a/app/views/admin/product_options/add_option_selection.rjs b/app/views/admin/product_options/add_option_selection.rjs
index 5524052..0325668 100644
--- a/app/views/admin/product_options/add_option_selection.rjs
+++ b/app/views/admin/product_options/add_option_selection.rjs
@@ -1,14 +1,14 @@
-page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list', 
+page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list',
                                    :locals => { :product_option => @product_option,
                                                 :product => @product }
 
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
  		                                      :locals => { :product_option => @product_option,
  		                                                   :product => @product,
  		                                                   :product_option_selection => @selection }
- 		                                      
-page[dom_id(@selection, 'name')].visual_effect :highlight, :duration => 3     
 
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }         
-                                
+page[dom_id(@selection, 'name')].visual_effect :highlight, :duration => 3
+
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
+
diff --git a/app/views/admin/product_options/apply_option_to_product.rjs b/app/views/admin/product_options/apply_option_to_product.rjs
index 5a5faf6..4924d02 100644
--- a/app/views/admin/product_options/apply_option_to_product.rjs
+++ b/app/views/admin/product_options/apply_option_to_product.rjs
@@ -1,13 +1,13 @@
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }           
-page[dom_id(@product_option, 'name')].visual_effect :highlight, :duration => 3  
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
+page[dom_id(@product_option, 'name')].visual_effect :highlight, :duration => 3
 
 page[:product_option_selections].show
-                                                                
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
 		                                      :locals => { :product_option => @product_option,
-		                                                   :product => @product } 
-		                                                   
+		                                                   :product => @product }
+
 page[:product_option_select].replace_html :partial => '/admin/product_options/product_option_select',
                                          :locals => { :product => @product,
                                          :available_options => @available_options }
\ No newline at end of file
diff --git a/app/views/admin/product_options/create.rjs b/app/views/admin/product_options/create.rjs
index 766bc70..ba25209 100644
--- a/app/views/admin/product_options/create.rjs
+++ b/app/views/admin/product_options/create.rjs
@@ -1,14 +1,14 @@
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }           
-page[dom_id(@product_option, 'name')].visual_effect :highlight, :duration => 3  
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
+page[dom_id(@product_option, 'name')].visual_effect :highlight, :duration => 3
 
 page[:product_option_selections].show
-                                                                
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
 		                                      :locals => { :product_option => @product_option,
 		                                                   :product => @product,
-		                                                   :product_option_selection => @product_option_selection } 
-		                                                   
+		                                                   :product_option_selection => @product_option_selection }
+
 #page[:product_option_select].replace_html :partial => '/admin/product_options/product_option_select',
 #                                         :locals => { :product => @product,
 #                                         :available_options => @available_options }
\ No newline at end of file
diff --git a/app/views/admin/product_options/destroy.rjs b/app/views/admin/product_options/destroy.rjs
index ab560df..f84176e 100644
--- a/app/views/admin/product_options/destroy.rjs
+++ b/app/views/admin/product_options/destroy.rjs
@@ -1,6 +1,6 @@
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }      
-		                                                   
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
+
 #page[:product_option_select].replace_html :partial => 'product_option_select',
 #                                          :locals => { :product => @product,
 #                                                        :available_options => @available_options }
\ No newline at end of file
diff --git a/app/views/admin/product_options/edit.rjs b/app/views/admin/product_options/edit.rjs
index 5d3caf8..6065c33 100644
--- a/app/views/admin/product_options/edit.rjs
+++ b/app/views/admin/product_options/edit.rjs
@@ -1,15 +1,15 @@
 page[:options_form].replace_html :partial => '/admin/product_options/options_form',
                                  :locals => { :product_option => @product_option,
                                               :product => @product }
-                                 
+
 page[:product_option_selections].show
 
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
 		                                      :locals => { :product_option => @product_option,
 		                                                   :product => @product,
 		                                                   :product_option_selection => ProductOptionSelection.new }
 
- 
-page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list', 
+
+page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list',
                                   :locals => { :product_option => @product_option,
                                                :product => @product }
\ No newline at end of file
diff --git a/app/views/admin/product_options/edit_option_selection.rjs b/app/views/admin/product_options/edit_option_selection.rjs
index aeb6854..e90c8b7 100644
--- a/app/views/admin/product_options/edit_option_selection.rjs
+++ b/app/views/admin/product_options/edit_option_selection.rjs
@@ -2,5 +2,4 @@ page[:selection_form].replace_html :partial => '/admin/product_options/option_se
                                  :locals => { :product_option_selection => @option_selection,
                                               :product => @product,
                                               :product_option => @product_option }
-                                 
- 
\ No newline at end of file
+
diff --git a/app/views/admin/product_options/remove_option_selection.rjs b/app/views/admin/product_options/remove_option_selection.rjs
index 442a78c..eb34c30 100644
--- a/app/views/admin/product_options/remove_option_selection.rjs
+++ b/app/views/admin/product_options/remove_option_selection.rjs
@@ -1,12 +1,12 @@
-page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list', 
+page[:selection_list].replace_html :partial => '/admin/product_options/option_selection_list',
                                    :locals => { :product_option => @product_option,
                                                 :product => @product }
 
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
  		                                      :locals => { :product_option => @product_option,
  		                                                   :product => @product,
  		                                                   :product_option_selection => @selection }
 
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }         
-                                
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
+
diff --git a/app/views/admin/product_options/update.rjs b/app/views/admin/product_options/update.rjs
index def969b..06e5c96 100644
--- a/app/views/admin/product_options/update.rjs
+++ b/app/views/admin/product_options/update.rjs
@@ -1,9 +1,9 @@
-page[:option_list].replace_html :partial => '/admin/product_options/option_list', 
-                                :locals => { :product => @product }          
+page[:option_list].replace_html :partial => '/admin/product_options/option_list',
+                                :locals => { :product => @product }
 
 page[:product_option_selections].show
-                                                                
-page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form', 
+
+page[:selection_form].replace_html render :partial => '/admin/product_options/option_selection_form',
 		                                      :locals => { :product_option => @product_option,
 		                                                   :product => @product,
 		                                                   :product_option_selection => ProductOptionSelection.new }
diff --git a/app/views/admin/products/_categories.html.erb b/app/views/admin/products/_categories.html.erb
index 1a4a0f4..3a45eb8 100644
--- a/app/views/admin/products/_categories.html.erb
+++ b/app/views/admin/products/_categories.html.erb
@@ -1,9 +1,9 @@
 <div id="category-drop-down">
   <br/><h2>Category:</h2>
-  <%= select_tag 'category_ids[]', 
-                  options_for_select(nested_set_options(Category.root.children) do 
-                    |i| raw("#{'&nbsp;&nbsp;' * (i.level - 1)} #{i.name}") 
-                  end, 
+  <%= select_tag 'category_ids[]',
+                  options_for_select(nested_set_options(Category.root.children) do
+                    |i| raw("#{'&nbsp;&nbsp;' * (i.level - 1)} #{i.name}")
+                  end,
                   :disabled => @product.category_ids), :id => 'category_select'  %>
 
   <%= link_to "Add Category", admin_product_path(@product), :id => 'add_category' %>
diff --git a/app/views/admin/products/_details.html.erb b/app/views/admin/products/_details.html.erb
index c189878..aa00deb 100644
--- a/app/views/admin/products/_details.html.erb
+++ b/app/views/admin/products/_details.html.erb
@@ -6,16 +6,16 @@
 	<%= form.text_field :name, :size => 20 %><br/>
 	<label for="subname">SubName:</label>
 	<%= form.text_field :subname, :size => 10 %><br/>
-	<hr/> 
+	<hr/>
 	<%= form.check_box :available %> Available<br/>
 	<%= form.check_box :is_featured %> Featured Product<br/>
 	<label for="shipping_type">Shipping Type *:</label>
-	<%= form.select :shipping_type || 1, ShippingType::PRODUCT_SHIPPING_TYPES.invert %><br/>	
+	<%= form.select :shipping_type || 1, ShippingType::PRODUCT_SHIPPING_TYPES.invert %><br/>
   <label for="flat_rate_shipping">Flat Rate Shipping Price :</label>
 	<%= form.text_field :flat_rate_shipping, :size => 10 %><br/>
 	<hr/>
 	<label for="sku">Sku *:</label>
-	<%= form.text_field :sku, :size => 10 %><br/>	
+	<%= form.text_field :sku, :size => 10 %><br/>
 	<label for="price">Price: $</label>
 	<%= form.text_field :price, :size => 10 %>
 	<label for="weight">Weight *: </label>
@@ -26,7 +26,7 @@
 	<%= form.text_field :width, :size => 10, :class => 'gt-form-text'  %>
 	<label for="height">Height </label>
 	<%= form.text_field :height, :size => 10, :class => 'gt-form-text'  %>
-  <hr/>	
+  <hr/>
 	<label for="vendor_id">Vendor:</label>
 	<%= form.collection_select :vendor_id, @vendors, :id, :name %><br/>
 	<hr/>
@@ -35,9 +35,9 @@
 	<hr/>
 	<label for="admin_notes">Admin Notes:</label>
 	<%= form.text_area :admin_notes, :rows => 10 %><br/>
-	
+
 	<hr/>
-	
+
 	<br/>
 	<br/><br/>
     <%= submit_tag "Create" %>
diff --git a/app/views/admin/products/_optimizations.html.erb b/app/views/admin/products/_optimizations.html.erb
index 026be9c..2a17831 100644
--- a/app/views/admin/products/_optimizations.html.erb
+++ b/app/views/admin/products/_optimizations.html.erb
@@ -1,23 +1,23 @@
 <% form_for :product, @product, :url => admin_product_url(@product.id),
             :html => { :class => 'gt-form', :method => :put } do |form| %>
-  <p>These fields help with Search Engine Optimization. 
-  
+  <p>These fields help with Search Engine Optimization.
+
   <hr/>
-  	
+
 	<label for="title">Title</label>
 	<%= form.text_field :title, :class => 'gt-form-text'  %><br/>
 
 	<label for="keywords">Meta Keywords</label>
-	<%= form.text_area :keywords, :rows => 3, 
+	<%= form.text_area :keywords, :rows => 3,
 					   :cols => 90, :class => 'gt-form-textarea' %><br/>
 	<label for="description">Meta Description</label>
-	<%= form.text_area :description, :rows => 6, 
+	<%= form.text_area :description, :rows => 6,
 					   :cols => 90, :class => 'gt-form-textarea' %><br/>
 <br/>
-    <%= image_submit_tag 'gt/btn-save.jpg', :class => 'gt-submit-btn' %>                             
+    <%= image_submit_tag 'gt/btn-save.jpg', :class => 'gt-submit-btn' %>
   	<br/><br/>
-	
+
   </p>
-  	
-  
+
+
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/products/_variant_image.html.erb b/app/views/admin/products/_variant_image.html.erb
index 8720746..6a8fa4b 100644
--- a/app/views/admin/products/_variant_image.html.erb
+++ b/app/views/admin/products/_variant_image.html.erb
@@ -1,5 +1,5 @@
 <% if variant_image.new_record? %>
-  <% form_for [:admin, variant_image], 
+  <% form_for [:admin, variant_image],
                :html => { :multipart => true, :id => 'variant_image_add' } do |form|%>
 	  <p>
 	    <label for="uploaded_data">Upload Regular Image:</label>
@@ -14,7 +14,7 @@
   <h3>Regular Size:</h3><br/>
   <div>
 	  <%= image_tag variant_image.filename.url %>
-	  <%= link_to 'Remove Variant Image', admin_variant_image_path(variant_image), 
+	  <%= link_to 'Remove Variant Image', admin_variant_image_path(variant_image),
 	    :class => "destroy-variant-image" %>
   </div>
   <div id="variant_large_image">
diff --git a/app/views/admin/products/_variant_large_image.html.erb b/app/views/admin/products/_variant_large_image.html.erb
index 65c4a40..fe30d05 100644
--- a/app/views/admin/products/_variant_large_image.html.erb
+++ b/app/views/admin/products/_variant_large_image.html.erb
@@ -1,5 +1,5 @@
 <% if large_image.new_record? %>
-  <% form_for [:admin, variant_image, large_image], 
+  <% form_for [:admin, variant_image, large_image],
               :html => { :multipart => true, :id => 'variant_image_large_add' } do |form| %>
     <p>
       <label for="uploaded_data">Upload Large Image:</label>
@@ -13,7 +13,7 @@
   <h3>Large Image:</h3><br/>
   <div>
   	<%= image_tag large_image.filename.url %>
-  	<%= link_to 'Remove Large Image', admin_variant_image_variant_large_image_path(variant_image, large_image), 
+  	<%= link_to 'Remove Large Image', admin_variant_image_variant_large_image_path(variant_image, large_image),
   	    :class => "destroy-variant-large-image" %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/products/_variant_thumbnail.html.erb b/app/views/admin/products/_variant_thumbnail.html.erb
index 58e6171..d88e6f5 100644
--- a/app/views/admin/products/_variant_thumbnail.html.erb
+++ b/app/views/admin/products/_variant_thumbnail.html.erb
@@ -1,5 +1,5 @@
 <% if thumbnail.new_record? %>
-  <% form_for [:admin, variant_image, thumbnail], 
+  <% form_for [:admin, variant_image, thumbnail],
               :html => { :multipart => true, :id => 'variant_thumbnail_add' } do |form| %>
     <p>
       <label for="uploaded_data">Upload Thumbnail:</label>
@@ -13,7 +13,7 @@
   <h3>Thumbnail:</h3><br/>
   <div>
   	<%= image_tag thumbnail.filename.url %>
-  	<%= link_to 'Remove Thumbnail Image', admin_variant_image_variant_image_thumbnail_path(variant_image, thumbnail), 
+  	<%= link_to 'Remove Thumbnail Image', admin_variant_image_variant_image_thumbnail_path(variant_image, thumbnail),
   	    :class => "destroy-variant-thumbnail" %>
   </div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/products/_variants.html.erb b/app/views/admin/products/_variants.html.erb
index 02d7b92..ca8b625 100644
--- a/app/views/admin/products/_variants.html.erb
+++ b/app/views/admin/products/_variants.html.erb
@@ -27,7 +27,7 @@
   			    <% variant.product_option_selections.each do |selection| %>
   			      <td><%= selection.name %></td>
   			    <% end %>
-  			    
+
   				  <td>
   				    <% if inventory_managed? %>
   				      <%= variant_form.text_field :inventory, :size => 5 %>
@@ -42,10 +42,10 @@
   				    <%= check_box_tag "variant_checkbox", variant.id, false, :class => "variant_image_upload" %>
   				    <% if variant.variant_image %>
   				      <%= link_to image_tag(variant.variant_image.filename.url, :height => 30),
-  				                  admin_variant_image_path(variant.variant_image), 
+  				                  admin_variant_image_path(variant.variant_image),
   				                  :class => 'show-variant-image' %>
-               	<%= link_to 'Remove', admin_variant_path(variant), 
-                            :class => "remove-variant-image" %>  				   
+               	<%= link_to 'Remove', admin_variant_path(variant),
+                            :class => "remove-variant-image" %>
               <% end %>
   				  </td>
   			  </tr>
@@ -56,8 +56,8 @@
     	</tbody>
   	</table>
 	<% end %>
-	
-	<div id="variant_image"> 
+
+	<div id="variant_image">
 	  <%= render "admin/products/variant_image", :variant_image => variant_image %>
 	</div>
 </div>
\ No newline at end of file
diff --git a/app/views/admin/products/add_to_category.rjs b/app/views/admin/products/add_to_category.rjs
index 51e5625..e83b664 100644
--- a/app/views/admin/products/add_to_category.rjs
+++ b/app/views/admin/products/add_to_category.rjs
@@ -1,5 +1,5 @@
 
-page[:category_list].replace_html :partial => "category_list", 
+page[:category_list].replace_html :partial => "category_list",
                                   :locals => { :product_id => @product.id,
                                                :categories => @product.categories  }
 
diff --git a/app/views/admin/products/faux_products/_faux_products.html.erb b/app/views/admin/products/faux_products/_faux_products.html.erb
index c2b8af1..f00f374 100644
--- a/app/views/admin/products/faux_products/_faux_products.html.erb
+++ b/app/views/admin/products/faux_products/_faux_products.html.erb
@@ -28,8 +28,8 @@
 				</select>
 			</td>
 			<td>
-				<%= link_to 'Destroy', admin_product_faux_product_path(@product), 
-							:confirm => "Are you sure you want to delete #{ faux_product.name } ?", 
+				<%= link_to 'Destroy', admin_product_faux_product_path(@product),
+							:confirm => "Are you sure you want to delete #{ faux_product.name } ?",
 							:method => :delete %>
 			</td>
 			<br/>
@@ -43,7 +43,7 @@
 <h3>Faux Description:</h3>
 <% form_for :product, @product, :url => admin_product_url(@product),
             :html => { :class => 'gt-form', :method => :put } do |form| %>
-		<%= form.text_area :faux_description, :rows => 30, 
+		<%= form.text_area :faux_description, :rows => 30,
 						   :cols => 70, :class => 'gt-form-textarea' %><br/><br/>
 		<%= image_submit_tag 'gt/btn-save.jpg', :class => 'gt-submit-btn' %> or <%= link_to "Cancel", admin_product_path %>
 <% end %>
diff --git a/app/views/admin/products/images/_image_large_form.html.erb b/app/views/admin/products/images/_image_large_form.html.erb
index f663a4c..67a4bbc 100644
--- a/app/views/admin/products/images/_image_large_form.html.erb
+++ b/app/views/admin/products/images/_image_large_form.html.erb
@@ -1,5 +1,5 @@
 <div class="images_large_form">
-	<% form_for [:admin, image, large_image], 
+	<% form_for [:admin, image, large_image],
 	            :html => { :multipart => true, :class => 'image_large_add' } do |form| %>
 	  <p>
 	    <label for="uploaded_data">Upload Enlarged Image:</label>
@@ -10,4 +10,4 @@
 	    <%= image_submit_tag 'gt/btn-upload.jpg', :class => 'gt-submit-btn' %>
 	  </p>
 	<% end %>
-</div>	
+</div>
diff --git a/app/views/admin/products/images/_image_large_list.html.erb b/app/views/admin/products/images/_image_large_list.html.erb
index 017c865..c1a0469 100644
--- a/app/views/admin/products/images/_image_large_list.html.erb
+++ b/app/views/admin/products/images/_image_large_list.html.erb
@@ -2,6 +2,6 @@
 <br/>
 <div>
 	<%= image_tag large_image.filename.url %>
-	<%= link_to 'Remove Large Image', admin_product_image_product_large_image_path(image, large_image), 
+	<%= link_to 'Remove Large Image', admin_product_image_product_large_image_path(image, large_image),
 	    :class => "destroy-product-large-image" %>
 </div>
diff --git a/app/views/admin/products/images/_image_thumbnail_form.html.erb b/app/views/admin/products/images/_image_thumbnail_form.html.erb
index c0e5c09..7419004 100644
--- a/app/views/admin/products/images/_image_thumbnail_form.html.erb
+++ b/app/views/admin/products/images/_image_thumbnail_form.html.erb
@@ -1,5 +1,5 @@
 <div class="images_thumbnail_form">
-	<% form_for [:admin, image, thumbnail], 
+	<% form_for [:admin, image, thumbnail],
 	            :html => { :multipart => true, :class => 'image_thumbnail_add' } do |form| %>
 	  <p>
 	    <label for="uploaded_data">Upload Thumbnail Image:</label>
@@ -10,4 +10,4 @@
 	    <%= image_submit_tag 'gt/btn-upload.jpg', :class => 'gt-submit-btn' %>
 	  </p>
 	<% end %>
-</div>	
+</div>
diff --git a/app/views/admin/products/images/_image_thumbnail_list.html.erb b/app/views/admin/products/images/_image_thumbnail_list.html.erb
index 7448d41..fa450c7 100644
--- a/app/views/admin/products/images/_image_thumbnail_list.html.erb
+++ b/app/views/admin/products/images/_image_thumbnail_list.html.erb
@@ -2,6 +2,6 @@
 <br/>
 <div id="<%= dom_id(thumbnail, 'id') %>">
 	<%= image_tag thumbnail.filename.url %>
-	<%= link_to 'Remove Thumbnail', admin_product_image_product_image_thumbnail_path(image, thumbnail), 
+	<%= link_to 'Remove Thumbnail', admin_product_image_product_image_thumbnail_path(image, thumbnail),
 	    :class => "destroy-product-image-thumbnail" %>
 </div>
diff --git a/app/views/admin/products/images/_images.html.erb b/app/views/admin/products/images/_images.html.erb
index d344763..76a3302 100644
--- a/app/views/admin/products/images/_images.html.erb
+++ b/app/views/admin/products/images/_images.html.erb
@@ -7,4 +7,4 @@
   <% end %>
 </div>
 
-<%= render :partial => '/admin/products/images/image_form', :locals => { :product => product }  %>  
+<%= render :partial => '/admin/products/images/image_form', :locals => { :product => product }  %>
diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb
index a69de1e..69f325b 100644
--- a/app/views/admin/products/index.html.erb
+++ b/app/views/admin/products/index.html.erb
@@ -26,8 +26,8 @@
         <td><%= product.id %></td>
           <td class='blank'><%= link_to 'Edit', edit_admin_product_path(product.id) %></td>
           <td class='blank'>
-          <%= link_to 'Delete', admin_product_path(product.id), 
-                :confirm => 'Are you sure?', 
+          <%= link_to 'Delete', admin_product_path(product.id),
+                :confirm => 'Are you sure?',
                 :method => :delete %>
         </td>
         </tr>
diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb
index b91ab80..29fd213 100644
--- a/app/views/admin/products/new.html.erb
+++ b/app/views/admin/products/new.html.erb
@@ -14,7 +14,7 @@
     <div class="p7TPcontent">
       <div id="p7tpc1_1">
         <%= render :partial => "new" %>
-      </div>  
+      </div>
     </div>
   </div>
   <!--[if lte IE 6]>
diff --git a/app/views/admin/products/wholesale/_wholesale.html.erb b/app/views/admin/products/wholesale/_wholesale.html.erb
index 4bcc50c..d859518 100644
--- a/app/views/admin/products/wholesale/_wholesale.html.erb
+++ b/app/views/admin/products/wholesale/_wholesale.html.erb
@@ -10,13 +10,13 @@
 			<th>Quantity High</th>
 			<th>Price Per Product</th>
 		  </tr>
-			<%= render :partial => '/admin/products/wholesale/quantity_discount', 
+			<%= render :partial => '/admin/products/wholesale/quantity_discount',
 				   	   :collection => product.quantity_discounts %>
-		<br/>	
+		<br/>
 		</table>
 		<br/><br/>
 		<%= add_discount_link('Add Quantity Discount') %>
-	</div>		
+	</div>
 
 	<%= image_submit_tag 'gt/btn-save.jpg' %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/admin/promo_codes/_form.html.erb b/app/views/admin/promo_codes/_form.html.erb
index 2c1d18a..cab3b00 100644
--- a/app/views/admin/promo_codes/_form.html.erb
+++ b/app/views/admin/promo_codes/_form.html.erb
@@ -1,10 +1,10 @@
-<%= error_messages_for :promo_code %> 
+<%= error_messages_for :promo_code %>
 
 <% form_for [:admin, promo_code],
           :html => { :class => 'gt-form' } do |form| %>
 
   <label for="name">Name <span class="required-field">*</span>: </label>
-  <%= form.text_field :name, :size => 20, 
+  <%= form.text_field :name, :size => 20,
             :class => 'gt-form-text', :focus => true %><br/>
   <label for="code">Code <span class="required-field">*</span>:</label>
   <%= form.text_field :code, :size => 10, :class => 'gt-form-text'  %>
@@ -12,18 +12,18 @@
   <%= form.text_field :minimum_order_amount, :size => 10, :class => 'gt-form-text' %>
   <hr/>
   <label for="dollar_discount">Dollar Discount: $</label>
-  <%= form.text_field :dollar_discount, :size => 10, 
+  <%= form.text_field :dollar_discount, :size => 10,
             :class => 'gt-form-text'  %>
   <label for="percent_discount">Percent Discount: </label>
-  <%= form.text_field :percent_discount, :size => 10, 
+  <%= form.text_field :percent_discount, :size => 10,
             :class => 'gt-form-text'  %>
   <hr/>
   <label for="free_shipping">Free Shipping: </label>
   <%= form.check_box :free_shipping, :class => 'gt-form-checkbox' %>
   <label for="free_shipping_note">Free Shipping Note: </label>
-  <%= form.text_area :note, :rows => 5, 
+  <%= form.text_area :note, :rows => 5,
              :cols => 80, :class => 'gt-form-textarea' %>
   <br/><br/>
   <%= image_submit_tag 'gt/btn-save.jpg' %> or <%= link_to 'Back', admin_promo_codes_path %>
- 
+
 <% end %>
diff --git a/app/views/admin/promo_codes/edit.html.erb b/app/views/admin/promo_codes/edit.html.erb
index 3b4f3d2..08e4e19 100644
--- a/app/views/admin/promo_codes/edit.html.erb
+++ b/app/views/admin/promo_codes/edit.html.erb
@@ -1,5 +1,5 @@
 
 <h1>Edit Promo Code</h1>
 
-<%= render :partial => 'form', 
+<%= render :partial => 'form',
 		   :locals => { :promo_code => @promo_code } %>
diff --git a/app/views/admin/promo_codes/index.html.erb b/app/views/admin/promo_codes/index.html.erb
index 371b5a0..e2e00c8 100644
--- a/app/views/admin/promo_codes/index.html.erb
+++ b/app/views/admin/promo_codes/index.html.erb
@@ -27,9 +27,9 @@
 			<td><%= promo_code.percent_discount %>%</td>
 			<td><%= promo_code.free_shipping %></td>
 		    <td><%= link_to 'Edit', edit_admin_promo_code_path(promo_code) %></td>
-		    <td><%= link_to 'Delete', admin_promo_code_path(promo_code), 
-							:confirm => 
-								"Are you sure you want to delete #{promo_code.name}?", 
+		    <td><%= link_to 'Delete', admin_promo_code_path(promo_code),
+							:confirm =>
+								"Are you sure you want to delete #{promo_code.name}?",
 							:method => :delete %></td>
 		  </tr>
 		<% end %>
@@ -38,7 +38,7 @@
 </div>
 
 <% else %>
-No promo codes currently exist -- 
+No promo codes currently exist --
 	<%= link_to " create a new one.", new_admin_promo_code_path %>
 
 <% end %>
diff --git a/app/views/admin/promo_codes/new.html.erb b/app/views/admin/promo_codes/new.html.erb
index c63e07f..c693ee0 100644
--- a/app/views/admin/promo_codes/new.html.erb
+++ b/app/views/admin/promo_codes/new.html.erb
@@ -1,7 +1,7 @@
 
 <h1>New Promo Code</h1>
 
-<%= render :partial => 'form', 
+<%= render :partial => 'form',
            :locals => { :promo_code => @promo_code } %>
 
 
diff --git a/app/views/admin/regions/edit.html.erb b/app/views/admin/regions/edit.html.erb
index 5d5db93..6ac9a5e 100644
--- a/app/views/admin/regions/edit.html.erb
+++ b/app/views/admin/regions/edit.html.erb
@@ -20,7 +20,7 @@
           <div class="p7TPcontent">
             <div id="p7tpc1_1">
               <%= render :partial => "form" %>
-            </div>  
+            </div>
           </div>
         </div>
         <!--[if lte IE 6]>
diff --git a/app/views/admin/regions/index.html.erb b/app/views/admin/regions/index.html.erb
index ec37a21..705a3f3 100644
--- a/app/views/admin/regions/index.html.erb
+++ b/app/views/admin/regions/index.html.erb
@@ -13,7 +13,7 @@
       <th class="region"><%= region.name %></th>
       <th class="edit"><%= link_to 'Edit Region', edit_admin_region_path(region) %></th>
      </tr>
-     
+
 		<% if region.shipping_methods.length > 0 %>
 			<tr class='even'>
 				<th>Shipping Method</th>
diff --git a/app/views/admin/regions/new.html.erb b/app/views/admin/regions/new.html.erb
index 15bf703..bb0989a 100644
--- a/app/views/admin/regions/new.html.erb
+++ b/app/views/admin/regions/new.html.erb
@@ -20,7 +20,7 @@
           <div class="p7TPcontent">
             <div id="p7tpc1_1">
               <%= render :partial => "form" %>
-            </div>  
+            </div>
           </div>
         </div>
         <!--[if lte IE 6]>
diff --git a/app/views/admin/shipping_methods/edit.html.erb b/app/views/admin/shipping_methods/edit.html.erb
index d27e4e7..29465eb 100644
--- a/app/views/admin/shipping_methods/edit.html.erb
+++ b/app/views/admin/shipping_methods/edit.html.erb
@@ -18,7 +18,7 @@
               <% else %>
                 <%= render :partial => "form" %>
               <% end %>
-            </div>  
+            </div>
           </div>
         </div>
         <!--[if lte IE 6]>
diff --git a/app/views/admin/shipping_methods/new.html.erb b/app/views/admin/shipping_methods/new.html.erb
index 5b1c64b..4237901 100644
--- a/app/views/admin/shipping_methods/new.html.erb
+++ b/app/views/admin/shipping_methods/new.html.erb
@@ -15,7 +15,7 @@
           <div class="p7TPcontent">
             <div id="p7tpc1_1">
               <%= render :partial => "form" %>
-            </div>  
+            </div>
           </div>
         </div>
         <!--[if lte IE 6]>
diff --git a/app/views/admin/vendors/_details.html.erb b/app/views/admin/vendors/_details.html.erb
index 5f4c56c..e8c666d 100644
--- a/app/views/admin/vendors/_details.html.erb
+++ b/app/views/admin/vendors/_details.html.erb
@@ -8,7 +8,7 @@
 	<%= form.check_box :active %><br/>
 	<hr/>
 	<label for="shipping_type">Shipping Type *:</label>
-	<%= form.select :shipping_type || 1, ShippingType::VENDOR_SHIPPING_TYPES.invert %><br/>	
+	<%= form.select :shipping_type || 1, ShippingType::VENDOR_SHIPPING_TYPES.invert %><br/>
 	<label for="active">Drop-Ship *:</label>
 	<%= form.check_box :drop_ship %><br/>
 	<label for="active">Drop-Ship Fee *: $</label>
@@ -20,8 +20,8 @@
 	<hr/>
 	<label for="admin_notes">Admin Notes:</label>
 	<%= form.text_area :admin_notes, :rows => 10 %><br/>
-	
+
 	<hr/>
-	
+
 	<br/>
 	<br/><br/>
diff --git a/app/views/admin/vendors/edit.html.erb b/app/views/admin/vendors/edit.html.erb
index 16d51eb..0b7d18a 100644
--- a/app/views/admin/vendors/edit.html.erb
+++ b/app/views/admin/vendors/edit.html.erb
@@ -12,12 +12,12 @@
     <div class="p7TPcontent">
       <div id="p7tpc1_1">
         <h4>Details</h4>
-        <% form_for :vendor, @vendor , :url => admin_vendor_path(@vendor), 
+        <% form_for :vendor, @vendor , :url => admin_vendor_path(@vendor),
                     :html => { :method => :put } do |form| %>
           <%= render :partial => "details", :locals => { :form => form } %>
           <%= submit_tag "Update" %>
         <% end%>
-      </div>  
+      </div>
     </div>
   </div>
   <!--[if lte IE 6]>
diff --git a/app/views/admin/vendors/index.html.erb b/app/views/admin/vendors/index.html.erb
index 29c9e0b..1706da9 100644
--- a/app/views/admin/vendors/index.html.erb
+++ b/app/views/admin/vendors/index.html.erb
@@ -11,11 +11,11 @@
         <th>Drop-Ship</th>
       </tr>
     </thead>
-  
+
   <% for vendor in @vendors %>
     <tbody>
       <tr>
-        <td><%= vendor.name %></td>  
+        <td><%= vendor.name %></td>
         <td><%= vendor.zipcode %></td>
         <td><%= vendor.description %></td>
         <td><%= vendor.active %></td>
diff --git a/app/views/admin/vendors/new.html.erb b/app/views/admin/vendors/new.html.erb
index bd09b53..663d971 100644
--- a/app/views/admin/vendors/new.html.erb
+++ b/app/views/admin/vendors/new.html.erb
@@ -16,7 +16,7 @@
              <%= render :partial => "details", :locals => { :form => form }  %>
              <%= submit_tag "Create" %>
            <% end%>
-      </div>  
+      </div>
     </div>
   </div>
   <!--[if lte IE 6]>
diff --git a/app/views/admin/vendors/show.html.erb b/app/views/admin/vendors/show.html.erb
index ad48656..1c970a5 100644
--- a/app/views/admin/vendors/show.html.erb
+++ b/app/views/admin/vendors/show.html.erb
@@ -8,7 +8,7 @@
     </div>
     <div class="p7TPcontent">
       <div id="p7tpc1_1">
-	<hr/>	
+	<hr/>
 	<label for="name">Name: </label>
 	<%= @vendor.name %>
 	<label for="zipcode">Zipcode: </label>
@@ -20,7 +20,7 @@
 	<hr/>
 	<label for="description">Description: </label><%= @vendor.description %><br/>
 	<hr/>
-	<label for="admin_notes">Admin Notes: </label><%= @vendor.admin_notes %><br/>	
+	<label for="admin_notes">Admin Notes: </label><%= @vendor.admin_notes %><br/>
     <br/>
 	<br/>
 	<br/><br/>
diff --git a/app/views/carts/_cart.html.erb b/app/views/carts/_cart.html.erb
index 9192ca2..3e070a4 100644
--- a/app/views/carts/_cart.html.erb
+++ b/app/views/carts/_cart.html.erb
@@ -10,11 +10,11 @@
 		<th class="standcol">Total</th>
 		<th class="standcol"></th>
 	  </tr>
-	
+
 <% if @cart.cart_items.length > 0 %>
-  	<% form_for @cart 
+  	<% form_for @cart
 									 :html => { :name => 'cart_form' } do %>
-		
+
 	  <%= render :partial => "/carts/cart_item", :locals => { :cart => @cart } %>
 	  <tr>
 	    <td class="prodcol"/>
@@ -42,10 +42,10 @@
 	  <tr>
 	 	<td colspan="3"/>
 	 	<td id="shipping_methods">
-	 		<%= render :partial => '/carts/shipping_methods', 
+	 		<%= render :partial => '/carts/shipping_methods',
 	 				   :locals => { :shipping_methods => @shipping_methods } %>
 	 	</td>
-	  </tr> 
+	  </tr>
 	  <tr>
 		<td colspan="5"/>
 	  </tr>
@@ -57,7 +57,7 @@
 		<td class="standcol">&nbsp; </td>
 		<td class="standcol">&nbsp;</td>
 		<td class="">Subtotal</td>
-		<td class=""><%= number_to_currency(@subtotal) %></td>	
+		<td class=""><%= number_to_currency(@subtotal) %></td>
 	  </tr>
 	  <tr id="shipping_totals" class="nop">
 	  	<%= render :partial => "/carts/shipping_totals",
@@ -70,7 +70,7 @@
 		<td id="shipping_label" colspan="2">Tax (5% for Virginia residents)</td>
 	  </tr>
       <tr id="cart_totals" class="nop">
-	  	<%= render :partial => "/carts/cart_totals", 
+	  	<%= render :partial => "/carts/cart_totals",
 				   :locals => { :grand_total => @grand_total }  %>
 	  </tr>
 	<% end %>
@@ -78,7 +78,7 @@
 		<tr>
 			<td><h4>Your Cart Is Empty...</h4></td>
 		</tr>
-		
+
 <% end %>
 	</table>
   </div> <!-- /boxcontainer -->
diff --git a/app/views/carts/_cart_item.html.erb b/app/views/carts/_cart_item.html.erb
index 7c51c04..999673e 100644
--- a/app/views/carts/_cart_item.html.erb
+++ b/app/views/carts/_cart_item.html.erb
@@ -4,8 +4,8 @@
 	<tr>
 		<% cart_item.price %>
 	    <td class="prodcol">
-			<%= link_to cart_item.product.name, 	 
-	           			category_product_path(cart_item.product.category, 
+			<%= link_to cart_item.product.name,
+	           			category_product_path(cart_item.product.category,
 						cart_item.product) %>
 			<% if cart_item.option_selections.size > 0 %>
    				(<%= render :partial => '/carts/cart_item_selections',
@@ -22,9 +22,9 @@
 			<%= h(number_to_currency(cart_item.price * cart_item.quantity)) %>
 		</td>
 		<td class="standcol">
-			<%= link_to 'Remove', cart_cart_item_path(cart, cart_item), 
+			<%= link_to 'Remove', cart_cart_item_path(cart, cart_item),
 						:confirm => "Are you sure you want to remove
-									 #{cart_item.product.name}?", 
+									 #{cart_item.product.name}?",
 						:method => :delete %>
 		</td>
 	</tr>
diff --git a/app/views/carts/_promo_code.html.erb b/app/views/carts/_promo_code.html.erb
index 33bdef8..b589f24 100644
--- a/app/views/carts/_promo_code.html.erb
+++ b/app/views/carts/_promo_code.html.erb
@@ -5,7 +5,7 @@
 	<td class="standcol">&nbsp;</td>
 	<td>Promo Code</td>
 	<td><%= cart.promo_code %></td>
-	
+
 	<% if cart.promo_discount > 0 %>
 		<tr>
 			<td class="prodcol"><br/><br/></td>
@@ -15,5 +15,5 @@
 			<td><%= cart.promo_discount %></td>
 		</tr>
 	<% end %>
-	
+
 <% end %>
\ No newline at end of file
diff --git a/app/views/carts/_shipping_methods.html.erb b/app/views/carts/_shipping_methods.html.erb
index 76812ce..1bc7ce7 100644
--- a/app/views/carts/_shipping_methods.html.erb
+++ b/app/views/carts/_shipping_methods.html.erb
@@ -1,2 +1,2 @@
 <%= select_tag :methods, options_from_collection_for_select(shipping_methods, :id, :name,
-                                                            @default_method.id) %><br/> 
+                                                            @default_method.id) %><br/>
diff --git a/app/views/carts/refresh_shipping_methods.rjs b/app/views/carts/refresh_shipping_methods.rjs
index bba8aad..af63493 100644
--- a/app/views/carts/refresh_shipping_methods.rjs
+++ b/app/views/carts/refresh_shipping_methods.rjs
@@ -1,12 +1,12 @@
-page[:shipping_methods].replace_html :partial => "/carts/shipping_methods", 
+page[:shipping_methods].replace_html :partial => "/carts/shipping_methods",
                                      :locals => { :shipping_methods => @shipping_methods }
-page[:shipping_totals].replace_html :partial => "/carts/shipping_totals", 
+page[:shipping_totals].replace_html :partial => "/carts/shipping_totals",
                                    :locals => { :shipping_total => @shipping_total }
 #page[:shipping_label].visual_effect :highlight, :duration => 3
 #page[:shipping_total].visual_effect :highlight, :duration => 3
 
 
-page[:cart_totals].replace_html :partial => "/carts/cart_totals", 
+page[:cart_totals].replace_html :partial => "/carts/cart_totals",
                                 :locals => { :grand_total => @grand_total }
 page[:cart_total].visual_effect :highlight, :duration => 3
 page[:cart_total_label].visual_effect :highlight, :duration => 3
\ No newline at end of file
diff --git a/app/views/carts/refresh_totals.rjs b/app/views/carts/refresh_totals.rjs
index 9d2b9e7..8099438 100644
--- a/app/views/carts/refresh_totals.rjs
+++ b/app/views/carts/refresh_totals.rjs
@@ -1,10 +1,10 @@
-page[:shipping_totals].replace_html :partial => "/carts/shipping_totals", 
+page[:shipping_totals].replace_html :partial => "/carts/shipping_totals",
                                     :locals => { :shipping_total => @shipping_total }
 #page[:shipping_label].visual_effect :highlight, :duration => 3
 #page[:shipping_total].visual_effect :highlight, :duration => 3
 
-page[:cart_totals].replace_html :partial => "/carts/cart_totals", 
+page[:cart_totals].replace_html :partial => "/carts/cart_totals",
                                 :locals => { :grand_total => @grand_total }
 page[:cart_total].visual_effect :highlight, :duration => 3
-page[:cart_total_label].visual_effect :highlight, :duration => 3,                                 
+page[:cart_total_label].visual_effect :highlight, :duration => 3,
                                       :endcolor => '#f3f5da'
\ No newline at end of file
diff --git a/app/views/categories/_categories.html.erb b/app/views/categories/_categories.html.erb
index dee7fe7..25d873c 100644
--- a/app/views/categories/_categories.html.erb
+++ b/app/views/categories/_categories.html.erb
@@ -2,15 +2,15 @@
 <% categories.each do |category| %>
 	<div class="box1"><div class="box2"><div class="box3"><div class="box4 clearfix">
 	    <div class="photobox">
-		 	<%= link_to image_tag(category.category_image), 	 
+		 	<%= link_to image_tag(category.category_image),
 		           category_path(category) unless category.category_image.blank? %>
 		</div> <!-- /photobox -->
 
 		<div class="infobox">
-		  <h4><%= link_to category.name, 	 
+		  <h4><%= link_to category.name,
 		           category_path(category) %></h4>
 		  <br/><br/>
-		  <%= link_to 'view shirts >>', 	 
+		  <%= link_to 'view shirts >>',
 	           category_path(category) %>
 		</div> <!-- /infobox -->
 		<br class="clear" />
diff --git a/app/views/categories/_sidenav.html.erb b/app/views/categories/_sidenav.html.erb
index 5ba031b..a827be3 100644
--- a/app/views/categories/_sidenav.html.erb
+++ b/app/views/categories/_sidenav.html.erb
@@ -7,7 +7,7 @@
           <ul>
             <% Category.tree('Womens').each do |category| %>
               <%= category.name %>
-            <% end %> 
+            <% end %>
             <li><a href="">All</a></li>
           </ul>
         </li>
diff --git a/app/views/index/about.html.erb b/app/views/index/about.html.erb
index d6a6d68..1b8f0c2 100644
--- a/app/views/index/about.html.erb
+++ b/app/views/index/about.html.erb
@@ -11,7 +11,7 @@
 <p>	<h4>The Green Label philosophy </h4> is one of respect; respect for our environment, respect for working people everywhere, and respect for ourselves through the choices we make.  </p>
 
 <p>	We are pleased to offer you this colorful collection of 100% certified organic ring spun cotton T-shirts and tops. Our super-soft, low impact garment dyed organic T-shirts are made in the USA. Each piece is artfully designed to deliver fun and positive messages about the environment, fair trade, sustainability, and issues that are important to us all. </p>
-	We urge you always to….<br/> 
+	We urge you always to….<br/>
 	      <h4>Respect Labor* Respect the Planet* Respect Yourself </h4>
 <br/><br/>
 	Namaste,<br/>
diff --git a/app/views/index/index.html.erb b/app/views/index/index.html.erb
index 998006b..9da850c 100644
--- a/app/views/index/index.html.erb
+++ b/app/views/index/index.html.erb
@@ -1,4 +1,4 @@
-<% title("Pebbles") -%>     	
+<% title("Pebbles") -%>
 <!-- organic cotton feature -->
 <div id="organic-cotton">
 	<!-- content -->
@@ -6,7 +6,7 @@
 		<img src="images/script-hd.gif" alt="" width="204" height="32" />
 		<p>At Green Label Organic we strive to produce the <i>most socially responsible</i> and <i>environmentally sustainable clothing</i> available. We offer you easy to wear, fun clothing, with a point of view.</p>
 	</div>
-	
+
 </div>
 
 <!-- box -->
@@ -17,7 +17,7 @@
 	</div>
 	<div id="tshirt-right">
 		<img src="images/shirt-right.gif" alt="Certified 100% Organic" width="207" height="139" />
-		
+
 		<img class="head" src="images/highest-quality.gif" alt="The Highest Quality" width="235" height="36" />
 		<p>Experience our super-soft organic shirts made with organic ring spun cotton. <br/><br/>Made in the USA.</p>
 	</div>
diff --git a/app/views/index/privacy_policy.html.erb b/app/views/index/privacy_policy.html.erb
index 9b8c278..1462e42 100644
--- a/app/views/index/privacy_policy.html.erb
+++ b/app/views/index/privacy_policy.html.erb
@@ -12,7 +12,7 @@
 <p>This notice applies to all information collected or submitted on the <b>Green Label Organic</b> website. On some pages, you can order products and make requests. The types of personal information collected at these pages are:</p>
 
 Name <br/>
-Billing Address<br/> 
+Billing Address<br/>
 Shipping Address<br/>
 Email address <br/>
 Phone number <br/>
diff --git a/app/views/index/support_local.html.erb b/app/views/index/support_local.html.erb
index 5c9354e..d48a3ba 100644
--- a/app/views/index/support_local.html.erb
+++ b/app/views/index/support_local.html.erb
@@ -1,5 +1,5 @@
 <div class="box1"><div class="box2"><div class="box3"><div class="box4 clearfix">
-	
+
 <h1>Support Local</h1>
 
 <a href="/support_local.pdf" target="_blank">>> Click for Support Local T-Shirts for your Organization </a>
diff --git a/app/views/order_notifier/order_confirmation.html.erb b/app/views/order_notifier/order_confirmation.html.erb
index 3ecd8b7..d296c44 100644
--- a/app/views/order_notifier/order_confirmation.html.erb
+++ b/app/views/order_notifier/order_confirmation.html.erb
@@ -18,7 +18,7 @@
 <strong>Order Details:</strong><br />
 <br /><br/>
 <% @order.order_items.each do |order_item| %>
-	<%= order_item.quantity %> - <%= order_item.product_name %> Organic T-Shirt - 
+	<%= order_item.quantity %> - <%= order_item.product_name %> Organic T-Shirt -
 	<%= number_to_currency(order_item.quantity * order_item.price) %><br/>
 <% end %>
 
@@ -33,16 +33,16 @@ Shipping: <%= number_to_currency(@order.shipping_cost) %><br/>
 <h2>Shipping Address</h2>
 <%= @order.shipping_address.address_1 %><br/>
 <%= @order.shipping_address.address_2 -%><br/>
-<%= @order.shipping_address.city %>, <%= @order.shipping_address.state %> 
+<%= @order.shipping_address.city %>, <%= @order.shipping_address.state %>
 <%= @order.shipping_address.postal_code %><br/>
 <%= @order.shipping_address.country %><br/>
 <br/><br/>
 <br/>
-<label><b>Shipping Method:</b></label>	
+<label><b>Shipping Method:</b></label>
 <span><%= @order.shipping_method %></span>
 <br/><br/>
 <h2>Contact us:</h2>
-Please contact us at 
+Please contact us at
 <a href="mailto:customerservice@greenlabel.com">
 customerservice@greenlabel.com</a> for any questions.<br />
 
diff --git a/app/views/order_notifier/supplier_confirmation.html.erb b/app/views/order_notifier/supplier_confirmation.html.erb
index 82cf21b..6118ae5 100644
--- a/app/views/order_notifier/supplier_confirmation.html.erb
+++ b/app/views/order_notifier/supplier_confirmation.html.erb
@@ -32,12 +32,12 @@ Shipping: <%= number_to_currency(@order.shipping_cost) %><br/>
 <h2>Shipping Address</h2>
 <%= @order.shipping_address.address_1 %><br/>
 <%= @order.shipping_address.address_2 -%><br/>
-<%= @order.shipping_address.city %>, <%= @order.shipping_address.state %> 
+<%= @order.shipping_address.city %>, <%= @order.shipping_address.state %>
 <%= @order.shipping_address.postal_code %><br/>
 <%= @order.shipping_address.country %><br/>
 <br/><br/>
 <h2>Contact us:</h2>
-Please contact us at 
+Please contact us at
 <a href="mailto:customerservice@greenlabel.com">
 customerservice@greenlabel.com</a> for any questions.<br />
 
diff --git a/app/views/orders/_billing_address.html.erb b/app/views/orders/_billing_address.html.erb
index 533f9be..8236633 100644
--- a/app/views/orders/_billing_address.html.erb
+++ b/app/views/orders/_billing_address.html.erb
@@ -1,5 +1,5 @@
 
-<div id="billing_address"> 
+<div id="billing_address">
 	<% fields_for :billing_address, billing_address do |address| %>
 		<h3>Billing Address</h3>
 		<%= error_messages_for :billing_address %>
@@ -7,17 +7,17 @@
 			<label>Address 1:</label>&nbsp;
 			<%= address.text_field :address_1, :size => 20 %><br/>
 			<label>Address 2:</label>&nbsp;
-			<%= address.text_field :address_2, :size => 20 %><br/>		
+			<%= address.text_field :address_2, :size => 20 %><br/>
 			<label>City: </label>&nbsp;
-			<%= address.text_field :city, :size => 20 %><br/>		
+			<%= address.text_field :city, :size => 20 %><br/>
 			<label>State/Province: </label>&nbsp;
-			<%= state(address, 'billing_address') %><br/>			
+			<%= state(address, 'billing_address') %><br/>
 			<label>ZIP / Other: </label>&nbsp;
-			<%= address.text_field :postal_code, :size => 15 %><br/>			
+			<%= address.text_field :postal_code, :size => 15 %><br/>
 			<label>Country: </label>&nbsp;
 			<%= country(address, 'billing_address') %>	<br/>
 		</div>
-		
+
 		<span class="clear"/>
 	<% end %>
 </div>
diff --git a/app/views/orders/_billing_shipping_info.html.erb b/app/views/orders/_billing_shipping_info.html.erb
index c81c7fb..a6b9d43 100644
--- a/app/views/orders/_billing_shipping_info.html.erb
+++ b/app/views/orders/_billing_shipping_info.html.erb
@@ -4,24 +4,24 @@
 	<div id='billing_details'>
 		<div id="billing_detail_labels">
 			<label>Full Name: </label>&nbsp;
-			<%= form.text_field :full_name, :size => 20 %><br/>			
+			<%= form.text_field :full_name, :size => 20 %><br/>
 			<label>Email: </label>&nbsp;
-			<%= form.text_field :email, :size => 20  %><br/>			
+			<%= form.text_field :email, :size => 20  %><br/>
 			<label>Phone Number: </label>&nbsp;
-			<%= form.text_field :phone_number, :size => 20 %><br/>			
+			<%= form.text_field :phone_number, :size => 20 %><br/>
 			<label>Company: </label>&nbsp;
-			<%= form.text_field :business, :size => 20 %><br/>	     
+			<%= form.text_field :business, :size => 20 %><br/>
 	</div>
-		
-		
+
+
 		<span class="clear"/>
-</div> 
+</div>
 	<div>
-		<%= render :partial => 'billing_address', 
-					:locals => { :address_type => 'billing', 
-								 :billing_address => billing_address } %> 
-		<%= render :partial => 'shipping_address', 
-				:locals => { :address_type => 'shipping', 
+		<%= render :partial => 'billing_address',
+					:locals => { :address_type => 'billing',
+								 :billing_address => billing_address } %>
+		<%= render :partial => 'shipping_address',
+				:locals => { :address_type => 'shipping',
 							 :shipping_address => shipping_address }  %>
   		<br class="clear" />
 	</div> <!-- checkout -->
diff --git a/app/views/orders/_payment_method.html.erb b/app/views/orders/_payment_method.html.erb
index cc68423..53b096e 100644
--- a/app/views/orders/_payment_method.html.erb
+++ b/app/views/orders/_payment_method.html.erb
@@ -16,41 +16,41 @@
     <%#= radio_button_tag 'payment_method', 'pay_pay', false,
        :onclick => "payment_credit_card_details_hide()" %>
     <!-- Pay with <img src='/images/paypal.png' /> -->
-  </div> 
-  
+  </div>
+
   <div id="credit_card_details">
     <b>Credit Card</b>
     <br/>
     <div id="what_is_this" style="display:none">
       <p>A three- or four-digit security code that is printed on the back of credit cards in  signature panel (or on the front for American Express cards).</p>
     </div>
-    
+
     <div id="field_details">
       <% fields_for :credit_card, credit_card do |credit_card| %>
-	<label for="order_card_name">First Name: </label><%= credit_card.text_field :first_name, :size => 29  %><br/>			
-	<label for="order_card_name">Last Name: </label><%= credit_card.text_field :last_name, :size => 29  %><br/>			
+	<label for="order_card_name">First Name: </label><%= credit_card.text_field :first_name, :size => 29  %><br/>
+	<label for="order_card_name">Last Name: </label><%= credit_card.text_field :last_name, :size => 29  %><br/>
 	<label for="order_card_number">Card Number: </label><%= credit_card.text_field :number, :size => 29 %><br/>
 	<label for="order_card_type">Card Type: </label>
-	<select name="credit_card[type]" id="order_card_type"> 
+	<select name="credit_card[type]" id="order_card_type">
 	  <%= options_for_select([["Visa", "visa" ],
 				  ["Master Card", "master"],
 				  ["Discover", "discover"],
 				  ["American Express", "american_express"]],
 				 credit_card.type) %>
-	</select><br/>			
-	<label for="order_card_expiration_month" class="contrast">Expiration Date: </label><%= select_month(credit_card.month, :prefix => "credit_card[month]", 
-								                                            :discard_type => true, :add_month_numbers => true ) %>			
+	</select><br/>
+	<label for="order_card_expiration_month" class="contrast">Expiration Date: </label><%= select_month(credit_card.month, :prefix => "credit_card[month]",
+								                                            :discard_type => true, :add_month_numbers => true ) %>
 	&nbsp;/&nbsp;
-	<%= select_year(credit_card.year, :prefix => "credit_card[year]", 
-			:discard_type => true, 		
-			:start_year => 2008, :end_year => 2015 ) %>	
-	<br/><br/>					
-	<label for="order_card_security_code" class="contrast">Security Code: </label><%= credit_card.text_field :verification_value, :size => 4  %>		
-	<a href="#" id="what_is_link">What is this?</a><br/>			
-      <% end %>	
+	<%= select_year(credit_card.year, :prefix => "credit_card[year]",
+			:discard_type => true,
+			:start_year => 2008, :end_year => 2015 ) %>
+	<br/><br/>
+	<label for="order_card_security_code" class="contrast">Security Code: </label><%= credit_card.text_field :verification_value, :size => 4  %>
+	<a href="#" id="what_is_link">What is this?</a><br/>
+      <% end %>
     </div>
-    
-    <span class="clear"/> 
+
+    <span class="clear"/>
   </div>
 </div>
 <p class="clear"></p>
diff --git a/app/views/orders/_paypal_form.html.erb b/app/views/orders/_paypal_form.html.erb
index 7eefd0d..e97fa42 100644
--- a/app/views/orders/_paypal_form.html.erb
+++ b/app/views/orders/_paypal_form.html.erb
@@ -1,4 +1,4 @@
 
-<%= link_to image_tag('paypal_button.gif'), 
+<%= link_to image_tag('paypal_button.gif'),
 					  paypal_checkout_orders_path %>
 
diff --git a/app/views/orders/_promo_code.html.erb b/app/views/orders/_promo_code.html.erb
index dbb8286..5584147 100644
--- a/app/views/orders/_promo_code.html.erb
+++ b/app/views/orders/_promo_code.html.erb
@@ -1,9 +1,9 @@
 <div id="apply_promo_code">
 	<%= hidden_field_tag 'subtotal', @sub_total %>
 	<%= text_field_tag 'order[promo_code]', "",
-					   :size => 15, 
+					   :size => 15,
 					   :id => 'promo_text_field' %>
-	<%= link_to_remote "<span> Apply Promo Code</span>", 
+	<%= link_to_remote "<span> Apply Promo Code</span>",
 						{ :submit => 'apply_promo_code',
 						  :url => promo_codes_path,
 						  :method => :post }
diff --git a/app/views/orders/_review.html.erb b/app/views/orders/_review.html.erb
index c61b53d..b6452bd 100644
--- a/app/views/orders/_review.html.erb
+++ b/app/views/orders/_review.html.erb
@@ -13,10 +13,10 @@
 	    	<td class="prodcol">&nbsp;</td>
 			<td class="standcol">&nbsp; </td>
 			<td class="breakdown">Subtotal</td>
-			<td class="breakdown"><%= number_to_currency(@subtotal) %></td>	
-	  	</tr> 
+			<td class="breakdown"><%= number_to_currency(@subtotal) %></td>
+	  	</tr>
 	    <tr>
-			<td>Shipping Region: <%= shipping_region(active_shipping_region_id) %><br/></td> 
+			<td>Shipping Region: <%= shipping_region(active_shipping_region_id) %><br/></td>
 			<td>Shipping Method: <%= shipping_method(active_shipping_method_id) %></td>
 		</tr>
 		<tr>
diff --git a/app/views/orders/_shipping_address.html.erb b/app/views/orders/_shipping_address.html.erb
index c482aa0..f306b40 100644
--- a/app/views/orders/_shipping_address.html.erb
+++ b/app/views/orders/_shipping_address.html.erb
@@ -4,26 +4,26 @@
 	<%= check_box_tag 'address_choice', 'same_as_billing', true,
 	 					  :onclick => "Element.toggle('shipping_address_fields');
 				  		  return  true;" %>
-	Ship to billing address 
+	Ship to billing address
 	<% fields_for :shipping_address, shipping_address do |address| %>
-	<div id="shipping_address_fields" style="display:none"> 
+	<div id="shipping_address_fields" style="display:none">
 		<%= error_messages_for "#{address_type}_address" %>
 
 		<div id="field_details">
 			<label>Address 1: </label>&nbsp;
-			<%= address.text_field :address_1, :size => 20  %><br/>			
+			<%= address.text_field :address_1, :size => 20  %><br/>
 			<label>Address 2: </label>&nbsp;
-			<%= address.text_field :address_2, :size => 20  %><br/>			
+			<%= address.text_field :address_2, :size => 20  %><br/>
 			<label>City: </label>&nbsp;
-			<%= address.text_field :city, :size => 20 %><br/>			
+			<%= address.text_field :city, :size => 20 %><br/>
 			<label>State/Province: </label>&nbsp;
-			<%= state(address, 'shipping_address') %><br/>			
+			<%= state(address, 'shipping_address') %><br/>
 			<label>ZIP/Other: </label>&nbsp;
-			<%= address.text_field :postal_code, :size => 15  %><br/>			
+			<%= address.text_field :postal_code, :size => 15  %><br/>
 			<label>Country: </label>&nbsp;
-			<%= country(address, 'shipping_address') %>					
+			<%= country(address, 'shipping_address') %>
 		</div>
-		
+
 	</div>
 	<% end %>
 </div>
diff --git a/app/views/orders/create.html.erb b/app/views/orders/create.html.erb
index c2d43a2..b1c680e 100644
--- a/app/views/orders/create.html.erb
+++ b/app/views/orders/create.html.erb
@@ -1,4 +1,4 @@
 
 
-<%= render :partial => 'receipt', 
+<%= render :partial => 'receipt',
 		   :locals => { :order => @order } %>
\ No newline at end of file
diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb
index e883e96..ddcd3f9 100644
--- a/app/views/orders/new.html.erb
+++ b/app/views/orders/new.html.erb
@@ -8,27 +8,27 @@
     <% end %>
     <h3><span>1</span> Review Your Order</h3>
     <div id="order_review">
-      <%= render :partial => '/carts/cart', 
+      <%= render :partial => '/carts/cart',
     :locals => { :order_review => true } %>
     </div>
     <div id="checkin_out">
       <h3><span>2</span> Promo Code</h3>
-      <% form_for :order, :url => orders_url, 
+      <% form_for :order, :url => orders_url,
          :html => { :method => :post } do |form| %>
-      
+
       <%= render :partial => 'promo_code' %>
-      
+
       <% if @cart.sub_total > 0 %>
         <h3><span>3</span> Payment</h3>
         <%= render :partial => 'payment_method', :credit_card => @order.credit_card %>
         <br/>
         <div id="billing_shipping_info">
     <h3><span>4</span> Information </h3>
-    <%= render :partial => 'billing_shipping_info', 
+    <%= render :partial => 'billing_shipping_info',
         :locals => { :billing_address => @order.billing_address,
           :shipping_address => @order.shipping_address,
           :form => form } %>
-        </div>  
+        </div>
         <hr/>
         <div class="btnclick btnright" id="credit_card_button">
     <br/>
@@ -43,14 +43,14 @@
     </span>
         </div>
         <div id="paypal_details" style="display:none">
-    <%#= link_to image_tag('paypal_button.gif'), 
+    <%#= link_to image_tag('paypal_button.gif'),
        paypal_checkout_path %>
         </div>
-        
+
       <% else %>
         <div class="order_process_errors">Please add additional items to checkout.</div>
       <% end %>
-      
+
 =======
         <div id="checkout">
 	  <% if @processing_error_message %>
@@ -58,27 +58,27 @@
 	  <% end %>
 	  <h3><span>1</span> Review Your Order</h3>
 	  <div id="order_review">
-	    <%= render :partial => '/carts/cart', 
+	    <%= render :partial => '/carts/cart',
 		:locals => { :order_review => true } %>
 	  </div>
 	  <div id="checkin_out">
 	    <h3><span>2</span> Promo Code</h3>
-	    <% form_for :order, :url => orders_url, 
+	    <% form_for :order, :url => orders_url,
 	       :html => { :method => :post } do |form| %>
-	    
+
 	    <%= render :partial => 'promo_code' %>
-	    
+
 	    <% if @cart.sub_total > 0 %>
 	      <h3><span>3</span> Payment</h3>
 	      <%= render :partial => 'payment_method', :credit_card => @order.credit_card %>
 	      <br/>
 	      <div id="billing_shipping_info">
 		<h3><span>4</span> Information </h3>
-		<%= render :partial => 'billing_shipping_info', 
+		<%= render :partial => 'billing_shipping_info',
 		    :locals => { :billing_address => @order.billing_address,
 		      :shipping_address => @order.shipping_address,
 		      :form => form } %>
-	      </div>	
+	      </div>
 	      <hr/>
 	      <div class="btnclick btnright" id="credit_card_button">
 		<br/>
@@ -93,14 +93,14 @@
 		</span>
 	      </div>
 	      <div id="paypal_details" style="display:none">
-		<%#= link_to image_tag('paypal_button.gif'), 
+		<%#= link_to image_tag('paypal_button.gif'),
 		   paypal_checkout_path %>
 	      </div>
-	      
+
 	    <% else %>
 	      <div class="order_process_errors">Please add additional items to checkout.</div>
 	    <% end %>
-	    
+
 >>>>>>> abf4830788514b0161ca65127932212b3c312e3a
 <% end %>
 </div>
diff --git a/app/views/orders/status.html.erb b/app/views/orders/status.html.erb
index 4b9394e..0a29c94 100644
--- a/app/views/orders/status.html.erb
+++ b/app/views/orders/status.html.erb
@@ -2,9 +2,9 @@
 <h1><%= @status_error %></h1>
 <% else %>
 	Confirmation #: <%= @status.confirmation %><br/>
-	Status: 
+	Status:
 	<%= @status.state %><br/>
-	Tracking Number: 
+	Tracking Number:
 	<%= @status.tracking_number %>
 
 	<%# if @order %>
diff --git a/app/views/products/_accessory_options.html.erb b/app/views/products/_accessory_options.html.erb
index 0ef12ca..9ded303 100644
--- a/app/views/products/_accessory_options.html.erb
+++ b/app/views/products/_accessory_options.html.erb
@@ -4,13 +4,13 @@
 
 	<% if product_option.selection_type == ProductOption::DROP_DOWN_LIST %>
 		<select name="accessories[<%= accessory.id %>][options]" id="options[]"><br/>
-			<% product_option.product_option_selections.each do |selection| %>			
+			<% product_option.product_option_selections.each do |selection| %>
 				<option value="<%= selection.id %>">
 					<% if selection.price_adjustment.blank? || selection.price_adjustment == 0 %>
-						<%= selection.name %> 	
-					<% else %>	
+						<%= selection.name %>
+					<% else %>
 						<%= selection.name + ' (' + number_to_currency(selection.price_adjustment +
-																	   product.price)  + ')'%>					
+																	   product.price)  + ')'%>
 					<% end %>
 				</option>
 			<% end %>
diff --git a/app/views/products/_products.html.erb b/app/views/products/_products.html.erb
index cdec697..dfc6b41 100644
--- a/app/views/products/_products.html.erb
+++ b/app/views/products/_products.html.erb
@@ -3,22 +3,22 @@
 	<div class="smallroundbox <%= 'boxright' if (count % 2 == 0) %>">
 	  <div class="boxcontainer">
 	    <div class="photobox">
-		 	  <%= link_to image_tag(product.product_image(true)), 	 
+		 	  <%= link_to image_tag(product.product_image(true)),
 		                category_product_path(product.category, product) %>
 		  </div> <!-- /photobox -->
 
 		<div class="infobox">
-		  <h4><%= link_to product.name, 	 
+		  <h4><%= link_to product.name,
 		           category_product_path(product.category, product) %></h4>
 		  <br/><%= number_to_currency(product.price) %><br/><br/><br/><br/>
 		  <% if @is_wholesaler %>
         	Wholesale: <h3><%= number_to_currency(product.wholesale_price) %></h3>
       	  <% end %>
-		  <%= link_to 'view >>', 	 
+		  <%= link_to 'view >>',
 	           category_product_path(product.category, product) %>
 		</div> <!-- /infobox -->
 		<br class="clear" />
-	  </div> <!-- smallroundbox --> 
+	  </div> <!-- smallroundbox -->
 	  <div class="smallroundboxbottom">&nbsp;</div>
 	</div> <!-- smallroundbox -->
 	<% count += 1 %>
diff --git a/app/views/products/_shipping.html.erb b/app/views/products/_shipping.html.erb
index d659907..b2d9a6a 100644
--- a/app/views/products/_shipping.html.erb
+++ b/app/views/products/_shipping.html.erb
@@ -1,15 +1,15 @@
 <div id = 'zipcode_error' style = 'display:none; color:red'>
   You must enter a zipcode to calculate shipping before adding item to cart
-</div>  
+</div>
 <div id = 'invalid_zipcode_error' style = 'display:none; color:red'>
-  Zipcode must be valid US zipcode (in the format "12345" or "12345-1234") 
+  Zipcode must be valid US zipcode (in the format "12345" or "12345-1234")
   or valid Canadian postal code  (in the format A1A 1A1)
 </div>
 <div id= 'shipping_quote'>
   <% if @shipping %>
     <% if @shipping == 0 %>
       Free Shipping!
-    <% else %>  
+    <% else %>
       Shipping: <%= number_to_currency(@shipping) %>
     <% end %>
   <% else %>
diff --git a/app/views/promo_codes/create.rjs b/app/views/promo_codes/create.rjs
index 9d4112b..fc5022e 100644
--- a/app/views/promo_codes/create.rjs
+++ b/app/views/promo_codes/create.rjs
@@ -2,12 +2,12 @@ page[:promo_code_message].replace_html @promo_code_message
 page[:promo_code_note].replace_html @promo_code_note
 page[:promo_code_note].visual_effect :highlight, :duration => 3,
                                      :endcolor => '#f3f5da'
-page[:promo_code_message].visual_effect :highlight, :duration => 3,                                 
+page[:promo_code_message].visual_effect :highlight, :duration => 3,
                                         :endcolor => '#f3f5da'
 
-page[:cart_totals].replace_html :partial => "/carts/cart_totals", 
-		                            :locals => { :grand_total => @grand_total }  
-		                            
-page[:shipping_totals].replace_html :partial => "/carts/shipping_totals", 
+page[:cart_totals].replace_html :partial => "/carts/cart_totals",
+		                            :locals => { :grand_total => @grand_total }
+
+page[:shipping_totals].replace_html :partial => "/carts/shipping_totals",
 		                                :locals => { :shipping_total => @shipping_total }
 
diff --git a/app/views/shared/_category_menu.html.erb b/app/views/shared/_category_menu.html.erb
index 4a2cb25..be0f49f 100644
--- a/app/views/shared/_category_menu.html.erb
+++ b/app/views/shared/_category_menu.html.erb
@@ -5,8 +5,8 @@
       <% if category.parent_id == 1 %>
         <li>
           <%= link_to category.name, category_products_path(category) %>
-        </li> 
-      <% end %>       
+        </li>
+      <% end %>
     <% end %>
   </ul>
 </div>
diff --git a/app/views/shipping_methods/index.js.erb b/app/views/shipping_methods/index.js.erb
index 1ce2762..0082547 100644
--- a/app/views/shipping_methods/index.js.erb
+++ b/app/views/shipping_methods/index.js.erb
@@ -1,4 +1,4 @@
-<%= render 'carts/shipping_info', :shipping_methods => @shipping_methods, 
-           :shipping_total => @shipping_total, :subtotal => @subtotal, 
+<%= render 'carts/shipping_info', :shipping_methods => @shipping_methods,
+           :shipping_total => @shipping_total, :subtotal => @subtotal,
            :grand_total => @grand_total, :cart => current_cart %>
 
diff --git a/app/views/shipping_methods/update.js.erb b/app/views/shipping_methods/update.js.erb
index 627e8e3..02d4526 100644
--- a/app/views/shipping_methods/update.js.erb
+++ b/app/views/shipping_methods/update.js.erb
@@ -1,2 +1,2 @@
-<%= render 'carts/totals', :shipping_total => @shipping_total, :subtotal => @subtotal, 
+<%= render 'carts/totals', :shipping_total => @shipping_total, :subtotal => @subtotal,
  :grand_total => @grand_total  %>
\ No newline at end of file
diff --git a/config/config.yml b/config/config.yml
index d2e8eb3..eaf3f96 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -12,8 +12,8 @@ development:
     fulfillment_merchant_id: ''
     ship_ups_url: 'https://wwwcie.ups.com/ups.app/xml'
     ship_sender_zip: '24091'
-    ship_sender_country: 'US'    
-    paypal_email: ''  
+    ship_sender_country: 'US'
+    paypal_email: ''
     google_cx: ''
     order_email: 'gustin@entryway.net'
     contact_email: 'gustin@entryway.net'
@@ -21,7 +21,7 @@ development:
     support_phone: '1.540.745.6162'
     site_address: 'http://localhost:3000/'
     pre_and_post_authorization: false
-    
+
 test:
     paypal_login: ''
     paypal_password: ''
@@ -35,8 +35,8 @@ test:
     fulfillment_merchant_id: ''
     ship_ups_url: 'https://wwwcie.ups.com/ups.app/xml'
     ship_sender_zip: '24091'
-    ship_sender_country: 'US'    
-    paypal_email: ''  
+    ship_sender_country: 'US'
+    paypal_email: ''
     google_cx: ''
     order_email: 'gustin@entryway.net'
     contact_email: 'gustin@entryway.net'
@@ -58,8 +58,8 @@ staging:
     fulfillment_merchant_id: ''
     ship_ups_url: 'https://wwwcie.ups.com/ups.app/xml'
     ship_sender_zip: '24091'
-    ship_sender_country: 'US'    
-    paypal_email: ''  
+    ship_sender_country: 'US'
+    paypal_email: ''
     google_cx: ''
     order_email: 'gustin@entryway.net'
     contact_email: 'gustin@entryway.net'
@@ -68,8 +68,8 @@ staging:
     site_address: 'http://greenlabel.entryway.net.com/'
     pre_and_post_authorization: false
     title
-                  
-production:   
+
+production:
     paypal_login: ''
     paypal_password: ''
     paypal_signature: ''
@@ -82,8 +82,8 @@ production:
     fulfillment_merchant_id: ''
     ship_ups_url: 'https://wwwcie.ups.com/ups.app/xml'
     ship_sender_zip: '24091'
-    ship_sender_country: 'US'    
-    paypal_email: ''  
+    ship_sender_country: 'US'
+    paypal_email: ''
     google_cx: ''
     order_email: 'gustin@entryway.net'
     contact_email: 'gustin@entryway.net'
diff --git a/config/gmaps_api_key.yml b/config/gmaps_api_key.yml
index b3a8b49..c633552 100644
--- a/config/gmaps_api_key.yml
+++ b/config/gmaps_api_key.yml
@@ -2,7 +2,7 @@
 #In this sample:
 #For development and test, we have only one possible host (localhost:3000), so there is only a single key associated with the mode.
 #In production, the app can be accessed through 2 different hosts: thepochisuperstarmegashow.com and exmaple.com. There then needs a 2-key hash. If you deployed to one host, only the API key would be needed (as in development and test).
- 
+
 development:
  ABQIAAAAzMUFFnT9uH0xq39J0Y4kbhTJQa0g3IQ9GZqIMmInSLzwtGDKaBR6j135zrztfTGVOm2QlWnkaidDIQ
 
diff --git a/db/migrate/20090916031338_create_table_variants.rb b/db/migrate/20090916031338_create_table_variants.rb
index f059eb6..61b69a3 100644
--- a/db/migrate/20090916031338_create_table_variants.rb
+++ b/db/migrate/20090916031338_create_table_variants.rb
@@ -1,6 +1,6 @@
 class CreateTableVariants < ActiveRecord::Migration
   def self.up
-    create_table :variants do |t| 
+    create_table :variants do |t|
       t.integer :product_id, :inventory, :variant_image_id
       t.decimal :weight, :price
       t.boolean :out_of_stock, :default => false
diff --git a/db/migrate/20090928030909_add_general_configuration_table.rb b/db/migrate/20090928030909_add_general_configuration_table.rb
index fab6597..d80a2cf 100644
--- a/db/migrate/20090928030909_add_general_configuration_table.rb
+++ b/db/migrate/20090928030909_add_general_configuration_table.rb
@@ -1,6 +1,6 @@
 class AddGeneralConfigurationTable < ActiveRecord::Migration
   def self.up
-    create_table :general_configurations do |t| 
+    create_table :general_configurations do |t|
       t.boolean :inventory_management
     end
   end
diff --git a/db/migrate/20100916173402_add_default_weight_to_products.rb b/db/migrate/20100916173402_add_default_weight_to_products.rb
index 580278e..a9d745a 100644
--- a/db/migrate/20100916173402_add_default_weight_to_products.rb
+++ b/db/migrate/20100916173402_add_default_weight_to_products.rb
@@ -1,6 +1,6 @@
 class AddDefaultWeightToProducts < ActiveRecord::Migration
   def self.up
-    change_column(:products, :weight, :decimal, :precision => 8, :scale => 2, 
+    change_column(:products, :weight, :decimal, :precision => 8, :scale => 2,
       :default => 0.0)
   end
 
diff --git a/db/schema.rb b/db/schema.rb
index f8f78fd..1c3e84e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
diff --git a/db/seeds.rb b/db/seeds.rb
index b2e6ab3..644e5ca 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,4 +1,4 @@
-Address.create(:address_1   => '123 test lane', 
+Address.create(:address_1   => '123 test lane',
                :address_2   => 'continued address',
                :city        => 'douglas',
                :postal_code => '32342',
@@ -12,7 +12,7 @@
 
 Product.create(:name => 'test',
                :sku  => '2342342')
-User.create(:login => 'admin', 
+User.create(:login => 'admin',
             :password => 'admin',
             :email => 'dev@entryway.net',
             :password_confirmation => 'admin',
diff --git a/fixture_rails_root/.bundle/config b/fixture_rails_root/.bundle/config
index 8ebbe30..7ea49e0 100644
--- a/fixture_rails_root/.bundle/config
+++ b/fixture_rails_root/.bundle/config
@@ -1,2 +1,2 @@
---- 
+---
 BUNDLE_DISABLE_SHARED_GEMS: "1"
diff --git a/fixture_rails_root/README b/fixture_rails_root/README
index 37ec8ea..de67c4f 100644
--- a/fixture_rails_root/README
+++ b/fixture_rails_root/README
@@ -1,7 +1,7 @@
 == Welcome to Rails
 
-Rails is a web-application framework that includes everything needed to create 
-database-backed web applications according to the Model-View-Control pattern. 
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
 
 This pattern splits the view (also called the presentation) into "dumb" templates
 that are primarily responsible for inserting pre-built data in between HTML tags.
@@ -57,14 +57,14 @@ Options +FollowSymLinks +ExecCGI
 
 # If you don't want Rails to look in certain directories,
 # use the following rewrite rules so that Apache won't rewrite certain requests
-# 
+#
 # Example:
 #   RewriteCond %{REQUEST_URI} ^/notrails.*
 #   RewriteRule .* - [L]
 
 # Redirect all requests not available on the filesystem to Rails
 # By default the cgi dispatcher is used which is very slow
-# 
+#
 # For better performance replace the dispatcher with the fastcgi one
 #
 # Example:
@@ -85,7 +85,7 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
 
 # In case Rails experiences terminal errors
 # Instead of displaying this message you can supply a file here which will be rendered instead
-# 
+#
 # Example:
 #   ErrorDocument 500 /500.html
 
@@ -132,7 +132,7 @@ and also on programming in general.
 
 Debugger support is available through the debugger command when you start your Mongrel or
 Webrick server with --debugger. This means that you can break out of execution at any point
-in the code, investigate and change the model, AND then resume execution! 
+in the code, investigate and change the model, AND then resume execution!
 You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
 Example:
 
diff --git a/fixture_rails_root/config/initializers/cookie_verification_secret.rb b/fixture_rails_root/config/initializers/cookie_verification_secret.rb
index 4653c91..1b419d3 100644
--- a/fixture_rails_root/config/initializers/cookie_verification_secret.rb
+++ b/fixture_rails_root/config/initializers/cookie_verification_secret.rb
@@ -2,6 +2,6 @@
 
 # Your secret key for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
+# Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.cookie_verifier_secret = '6b513992044fef314fcf675e2e424c3797f56c8f324246d5c33aba6df21ce932c823a8249cce95b779bd2bf522811bcef3db61ac68e40eb3267b6e08d66d8754';
diff --git a/fixture_rails_root/config/initializers/drop_to_console.rb b/fixture_rails_root/config/initializers/drop_to_console.rb
index f5fab05..d4c283c 100644
--- a/fixture_rails_root/config/initializers/drop_to_console.rb
+++ b/fixture_rails_root/config/initializers/drop_to_console.rb
@@ -32,7 +32,7 @@ def self.start_session(binding)
 #         true
 #       end
 #     end
-#     
+#
 #     console_for(binding)
 #
 # Then type "quit" or "exit" to get out. In a step definition, it should look like:
diff --git a/fixture_rails_root/config/initializers/inflections.rb b/fixture_rails_root/config/initializers/inflections.rb
index d531b8b..9e8b013 100644
--- a/fixture_rails_root/config/initializers/inflections.rb
+++ b/fixture_rails_root/config/initializers/inflections.rb
@@ -1,6 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Add new inflection rules using the following format 
+# Add new inflection rules using the following format
 # (all these examples are active by default):
 # ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
diff --git a/fixture_rails_root/config/initializers/session_store.rb b/fixture_rails_root/config/initializers/session_store.rb
index 4250149..723350c 100644
--- a/fixture_rails_root/config/initializers/session_store.rb
+++ b/fixture_rails_root/config/initializers/session_store.rb
@@ -2,7 +2,7 @@
 
 # Your secret key for verifying cookie session data integrity.
 # If you change this key, all old sessions will become invalid!
-# Make sure the secret is at least 30 characters and all random, 
+# Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
   :key         => '_fixture_rails_root_session',
diff --git a/fixture_rails_root/db/migrate/20090916031338_create_table_variants.rb b/fixture_rails_root/db/migrate/20090916031338_create_table_variants.rb
index f059eb6..61b69a3 100644
--- a/fixture_rails_root/db/migrate/20090916031338_create_table_variants.rb
+++ b/fixture_rails_root/db/migrate/20090916031338_create_table_variants.rb
@@ -1,6 +1,6 @@
 class CreateTableVariants < ActiveRecord::Migration
   def self.up
-    create_table :variants do |t| 
+    create_table :variants do |t|
       t.integer :product_id, :inventory, :variant_image_id
       t.decimal :weight, :price
       t.boolean :out_of_stock, :default => false
diff --git a/fixture_rails_root/db/migrate/20090928030909_add_general_configuration_table.rb b/fixture_rails_root/db/migrate/20090928030909_add_general_configuration_table.rb
index fab6597..d80a2cf 100644
--- a/fixture_rails_root/db/migrate/20090928030909_add_general_configuration_table.rb
+++ b/fixture_rails_root/db/migrate/20090928030909_add_general_configuration_table.rb
@@ -1,6 +1,6 @@
 class AddGeneralConfigurationTable < ActiveRecord::Migration
   def self.up
-    create_table :general_configurations do |t| 
+    create_table :general_configurations do |t|
       t.boolean :inventory_management
     end
   end
diff --git a/fixture_rails_root/db/migrate/20100916173402_add_default_weight_to_products.rb b/fixture_rails_root/db/migrate/20100916173402_add_default_weight_to_products.rb
index 580278e..a9d745a 100644
--- a/fixture_rails_root/db/migrate/20100916173402_add_default_weight_to_products.rb
+++ b/fixture_rails_root/db/migrate/20100916173402_add_default_weight_to_products.rb
@@ -1,6 +1,6 @@
 class AddDefaultWeightToProducts < ActiveRecord::Migration
   def self.up
-    change_column(:products, :weight, :decimal, :precision => 8, :scale => 2, 
+    change_column(:products, :weight, :decimal, :precision => 8, :scale => 2,
       :default => 0.0)
   end
 
diff --git a/fixture_rails_root/db/schema.rb b/fixture_rails_root/db/schema.rb
index 70f9ac4..a2bf9d2 100644
--- a/fixture_rails_root/db/schema.rb
+++ b/fixture_rails_root/db/schema.rb
@@ -1,4 +1,4 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
 #
diff --git a/fixture_rails_root/features/step_definitions/pickle_steps.rb b/fixture_rails_root/features/step_definitions/pickle_steps.rb
index 756c073..71cd62e 100644
--- a/fixture_rails_root/features/step_definitions/pickle_steps.rb
+++ b/fixture_rails_root/features/step_definitions/pickle_steps.rb
@@ -60,7 +60,7 @@
   model!(owner).send(association).should_not == model!(target)
 end
 
-# assert model.predicate? 
+# assert model.predicate?
 Then(/^#{capture_model} should (?:be|have) (?:an? )?#{capture_predicate}$/) do |name, predicate|
   if model!(name).respond_to?("has_#{predicate.gsub(' ', '_')}")
     model!(name).should send("have_#{predicate.gsub(' ', '_')}")
@@ -83,7 +83,7 @@
 Then(/^#{capture_model}'s (\w+) (should(?: not)?) be #{capture_value}$/) do |name, attribute, expectation, expected|
   actual_value  = model(name).send(attribute)
   expectation   = expectation.gsub(' ', '_')
-  
+
   case expected
   when 'nil', 'true', 'false'
     actual_value.send(expectation, send("be_#{expected}"))
diff --git a/fixture_rails_root/lib/tasks/cucumber.rake b/fixture_rails_root/lib/tasks/cucumber.rake
index 7db1a55..982054e 100644
--- a/fixture_rails_root/lib/tasks/cucumber.rake
+++ b/fixture_rails_root/lib/tasks/cucumber.rake
@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
diff --git a/fixture_rails_root/public/javascripts/pebbles/builder.js b/fixture_rails_root/public/javascripts/pebbles/builder.js
index 8301999..524d3a5 100644
--- a/fixture_rails_root/public/javascripts/pebbles/builder.js
+++ b/fixture_rails_root/public/javascripts/pebbles/builder.js
@@ -26,7 +26,7 @@ var Builder = {
   //       due to a Firefox bug
   node: function(elementName) {
     elementName = elementName.toUpperCase();
-    
+
     // try innerHTML approach
     var parentTag = this.NODEMAP[elementName] || 'div';
     var parentElement = document.createElement(parentTag);
@@ -34,14 +34,14 @@ var Builder = {
       parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
     } catch(e) {}
     var element = parentElement.firstChild || null;
-      
+
     // see if browser added wrapping tags
     if(element && (element.tagName.toUpperCase() != elementName))
       element = element.getElementsByTagName(elementName)[0];
-    
+
     // fallback to createElement approach
     if(!element) element = document.createElement(elementName);
-    
+
     // abort if nothing could be created
     if(!element) return;
 
@@ -62,13 +62,13 @@ var Builder = {
             // workaround firefox 1.0.X bug
             if(!element) {
               element = document.createElement(elementName);
-              for(attr in arguments[1]) 
+              for(attr in arguments[1])
                 element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
             }
             if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
           }
-        } 
+        }
 
     // text, or array of children
     if(arguments[2])
@@ -117,20 +117,20 @@ var Builder = {
     $(element).update(html.strip());
     return element.down();
   },
-  dump: function(scope) { 
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
-  
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
     var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
       "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
       "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
       "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
       "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
       "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-  
-    tags.each( function(tag){ 
-      scope[tag] = function() { 
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
-      } 
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      }
     });
   }
 }
diff --git a/fixture_rails_root/public/javascripts/pebbles/clusterer.js b/fixture_rails_root/public/javascripts/pebbles/clusterer.js
index eeb6dd9..05f3645 100644
--- a/fixture_rails_root/public/javascripts/pebbles/clusterer.js
+++ b/fixture_rails_root/public/javascripts/pebbles/clusterer.js
@@ -6,7 +6,7 @@
 // Copyright � 2005,2006 by Jef Poskanzer <jef@mail.acme.com>.
 // All rights reserved.
 //
-// Modified for inclusion into the YM4R library in accordance with the 
+// Modified for inclusion into the YM4R library in accordance with the
 // following license:
 //
 // Redistribution and use in source and binary forms, with or without
@@ -34,21 +34,21 @@
 
 
 // Constructor.
-Clusterer = function(markers,icon,maxVisibleMarkers,gridSize,minMarkersPerCluster,maxLinesPerInfoBox) {	
+Clusterer = function(markers,icon,maxVisibleMarkers,gridSize,minMarkersPerCluster,maxLinesPerInfoBox) {
     this.markers = [];
     if(markers){
 	for(var i =0 ; i< markers.length ; i++){
 	    this.addMarker(markers[i]);
 	}
-    }    
+    }
     this.clusters = [];
     this.timeout = null;
-        
+
     this.maxVisibleMarkers = maxVisibleMarkers || 150;
     this.gridSize = gridSize || 5;
     this.minMarkersPerCluster = minMarkersPerCluster || 5;
     this.maxLinesPerInfoBox = maxLinesPerInfoBox || 10;
-    
+
     this.icon = icon || G_DEFAULT_ICON;
 }
 
@@ -57,7 +57,7 @@ Clusterer.prototype = new GOverlay();
 Clusterer.prototype.initialize = function ( map ){
     this.map = map;
     this.currentZoomLevel = map.getZoom();
-   
+
     GEvent.addListener( map, 'zoomend', Clusterer.makeCaller( Clusterer.display, this ) );
     GEvent.addListener( map, 'moveend', Clusterer.makeCaller( Clusterer.display, this ) );
     GEvent.addListener( map, 'infowindowclose', Clusterer.makeCaller( Clusterer.popDown, this ) );
@@ -165,7 +165,7 @@ Clusterer.display = function ( clusterer ){
     dy *= 0.10;
     bounds = new GLatLngBounds(
       new GLatLng( sw.lat() - dy, sw.lng() - dx ),
-      new GLatLng( ne.lat() + dy, ne.lng() + dx ) 
+      new GLatLng( ne.lat() + dy, ne.lng() + dx )
     );
 
     // Partition the markers into visible and non-visible lists.
@@ -265,7 +265,7 @@ Clusterer.display = function ( clusterer ){
 		}
 	    }
 	}
-	
+
 	// Now make cluster-markers for any clusters that need one.
 	for ( i = 0, len = clusterer.clusters.length; i < len; ++i ){
 	    cluster = clusterer.clusters[i];
@@ -361,13 +361,13 @@ Clusterer.prototype.clearCluster = function ( cluster ){
 	    cluster.markers[i] = null;
 	}
     }
-    
+
     cluster.markers.length = 0;
     cluster.markerCount = 0;
-    
+
     if ( cluster == this.poppedUpCluster )
 	this.map.closeInfoWindow();
-    
+
     if ( cluster.onMap )
     {
 	this.map.removeOverlay( cluster.marker );
diff --git a/fixture_rails_root/public/javascripts/pebbles/controls.js b/fixture_rails_root/public/javascripts/pebbles/controls.js
index 5012cb8..12fbca1 100644
--- a/fixture_rails_root/public/javascripts/pebbles/controls.js
+++ b/fixture_rails_root/public/javascripts/pebbles/controls.js
@@ -7,18 +7,18 @@
 //  Richard Livsey
 //  Rahul Bhargava
 //  Rob Wills
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
-// Autocompleter.Base handles all the autocompletion functionality 
+// Autocompleter.Base handles all the autocompletion functionality
 // that's independent of the data source for autocompletion. This
 // includes drawing the autocompletion menu, observing keyboard
 // and mouse events, and similar.
 //
-// Specific autocompleters need to provide, at the very least, 
+// Specific autocompleters need to provide, at the very least,
 // a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method 
+// the text inside the monitored textbox changes. This method
 // should get the text for which to provide autocompletion by
 // invoking this.getToken(), NOT by directly accessing
 // this.element.value. This is to allow incremental tokenized
@@ -32,8 +32,8 @@
 // will incrementally autocomplete with a comma as the token.
 // Additionally, ',' in the above example can be replaced with
 // a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most 
-// useful when one of the tokens is \n (a newline), as it 
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
 // allows smart autocompletion after linebreaks.
 
 if(typeof Effect == 'undefined')
@@ -43,12 +43,12 @@ var Autocompleter = { }
 Autocompleter.Base = Class.create({
   baseInitialize: function(element, update, options) {
     element          = $(element)
-    this.element     = element; 
-    this.update      = $(update);  
-    this.hasFocus    = false; 
-    this.changed     = false; 
-    this.active      = false; 
-    this.index       = 0;     
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
     this.entryCount  = 0;
     this.oldElementValue = this.element.value;
 
@@ -61,28 +61,28 @@ Autocompleter.Base = Class.create({
     this.options.tokens       = this.options.tokens || [];
     this.options.frequency    = this.options.frequency || 0.4;
     this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-      function(element, update){ 
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
         if(!update.style.position || update.style.position=='absolute') {
           update.style.position = 'absolute';
           Position.clone(element, update, {
-            setHeight: false, 
+            setHeight: false,
             offsetTop: element.offsetHeight
           });
         }
         Effect.Appear(update,{duration:0.15});
       };
-    this.options.onHide = this.options.onHide || 
+    this.options.onHide = this.options.onHide ||
       function(element, update){ new Effect.Fade(update,{duration:0.15}) };
 
-    if(typeof(this.options.tokens) == 'string') 
+    if(typeof(this.options.tokens) == 'string')
       this.options.tokens = new Array(this.options.tokens);
     // Force carriage returns as token delimiters anyway
     if (!this.options.tokens.include('\n'))
       this.options.tokens.push('\n');
 
     this.observer = null;
-    
+
     this.element.setAttribute('autocomplete','off');
 
     Element.hide(this.update);
@@ -93,10 +93,10 @@ Autocompleter.Base = Class.create({
 
   show: function() {
     if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
+    if(!this.iefix &&
       (Prototype.Browser.IE) &&
       (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
+      new Insertion.After(this.update,
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
        'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
@@ -104,7 +104,7 @@ Autocompleter.Base = Class.create({
     }
     if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
   },
-  
+
   fixIEOverlapping: function() {
     Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
     this.iefix.style.zIndex = 1;
@@ -152,15 +152,15 @@ Autocompleter.Base = Class.create({
          Event.stop(event);
          return;
       }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
          (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
 
     this.changed = true;
     this.hasFocus = true;
 
     if(this.observer) clearTimeout(this.observer);
-      this.observer = 
+      this.observer =
         setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
   },
 
@@ -172,35 +172,35 @@ Autocompleter.Base = Class.create({
 
   onHover: function(event) {
     var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex) 
+    if(this.index != element.autocompleteIndex)
     {
         this.index = element.autocompleteIndex;
         this.render();
     }
     Event.stop(event);
   },
-  
+
   onClick: function(event) {
     var element = Event.findElement(event, 'LI');
     this.index = element.autocompleteIndex;
     this.selectEntry();
     this.hide();
   },
-  
+
   onBlur: function(event) {
     // needed to make click events working
     setTimeout(this.hide.bind(this), 250);
     this.hasFocus = false;
-    this.active = false;     
-  }, 
-  
+    this.active = false;
+  },
+
   render: function() {
     if(this.entryCount > 0) {
       for (var i = 0; i < this.entryCount; i++)
-        this.index==i ? 
-          Element.addClassName(this.getEntry(i),"selected") : 
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
           Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) { 
+      if(this.hasFocus) {
         this.show();
         this.active = true;
       }
@@ -209,27 +209,27 @@ Autocompleter.Base = Class.create({
       this.hide();
     }
   },
-  
+
   markPrevious: function() {
     if(this.index > 0) this.index--
       else this.index = this.entryCount-1;
     this.getEntry(this.index).scrollIntoView(true);
   },
-  
+
   markNext: function() {
     if(this.index < this.entryCount-1) this.index++
       else this.index = 0;
     this.getEntry(this.index).scrollIntoView(false);
   },
-  
+
   getEntry: function(index) {
     return this.update.firstChild.childNodes[index];
   },
-  
+
   getCurrentEntry: function() {
     return this.getEntry(this.index);
   },
-  
+
   selectEntry: function() {
     this.active = false;
     this.updateElement(this.getCurrentEntry());
@@ -246,7 +246,7 @@ Autocompleter.Base = Class.create({
       if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
     } else
       value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
+
     var bounds = this.getTokenBounds();
     if (bounds[0] != -1) {
       var newValue = this.element.value.substr(0, bounds[0]);
@@ -259,7 +259,7 @@ Autocompleter.Base = Class.create({
     }
     this.oldElementValue = this.element.value;
     this.element.focus();
-    
+
     if (this.options.afterUpdateElement)
       this.options.afterUpdateElement(this.element, selectedElement);
   },
@@ -271,20 +271,20 @@ Autocompleter.Base = Class.create({
       Element.cleanWhitespace(this.update.down());
 
       if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount = 
+        this.entryCount =
           this.update.down().childNodes.length;
         for (var i = 0; i < this.entryCount; i++) {
           var entry = this.getEntry(i);
           entry.autocompleteIndex = i;
           this.addObservers(entry);
         }
-      } else { 
+      } else {
         this.entryCount = 0;
       }
 
       this.stopIndicator();
       this.index = 0;
-      
+
       if(this.entryCount==1 && this.options.autoSelect) {
         this.selectEntry();
         this.hide();
@@ -300,7 +300,7 @@ Autocompleter.Base = Class.create({
   },
 
   onObserverEvent: function() {
-    this.changed = false;   
+    this.changed = false;
     this.tokenBounds = null;
     if(this.getToken().length>=this.options.minChars) {
       this.getUpdatedChoices();
@@ -353,16 +353,16 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 
   getUpdatedChoices: function() {
     this.startIndicator();
-    
-    var entry = encodeURIComponent(this.options.paramName) + '=' + 
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
       encodeURIComponent(this.getToken());
 
     this.options.parameters = this.options.callback ?
       this.options.callback(this.element, entry) : entry;
 
-    if(this.options.defaultParams) 
+    if(this.options.defaultParams)
       this.options.parameters += '&' + this.options.defaultParams;
-    
+
     new Ajax.Request(this.url, this.options);
   },
 
@@ -384,7 +384,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - choices - How many autocompletion choices to offer
 //
 // - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the 
+//                    text only at the beginning of strings in the
 //                    autocomplete array. Defaults to true, which will
 //                    match text at the beginning of any *word* in the
 //                    strings in the autocomplete array. If you want to
@@ -401,7 +401,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - ignoreCase - Whether to ignore case when autocompleting.
 //                 Defaults to true.
 //
-// It's possible to pass in a custom function as the 'selector' 
+// It's possible to pass in a custom function as the 'selector'
 // option, if you prefer to write your own autocompletion logic.
 // In that case, the other options above will not apply unless
 // you support them.
@@ -429,20 +429,20 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
         var entry     = instance.getToken();
         var count     = 0;
 
-        for (var i = 0; i < instance.options.array.length &&  
-          ret.length < instance.options.choices ; i++) { 
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
 
           var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ? 
-            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
             elem.indexOf(entry);
 
           while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) { 
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
                 elem.substr(entry.length) + "</li>");
               break;
-            } else if (entry.length >= instance.options.partialChars && 
+            } else if (entry.length >= instance.options.partialChars &&
               instance.options.partialSearch && foundPos != -1) {
               if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
                 partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
@@ -452,8 +452,8 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
               }
             }
 
-            foundPos = instance.options.ignoreCase ? 
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
               elem.indexOf(entry, foundPos + 1);
 
           }
@@ -939,7 +939,7 @@ Ajax.InPlaceCollectionEditor.DefaultOptions = {
   loadingCollectionText: 'Loading options...'
 };
 
-// Delayed observer, like Form.Element.Observer, 
+// Delayed observer, like Form.Element.Observer,
 // but waits for delay after last key input
 // Ideal for live-search fields
 
@@ -949,7 +949,7 @@ Form.Element.DelayedObserver = Class.create({
     this.element   = $(element);
     this.callback  = callback;
     this.timer     = null;
-    this.lastValue = $F(this.element); 
+    this.lastValue = $F(this.element);
     Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
   },
   delayedListener: function(event) {
diff --git a/fixture_rails_root/public/javascripts/pebbles/dragdrop.js b/fixture_rails_root/public/javascripts/pebbles/dragdrop.js
index bf5cfea..fc142ec 100644
--- a/fixture_rails_root/public/javascripts/pebbles/dragdrop.js
+++ b/fixture_rails_root/public/javascripts/pebbles/dragdrop.js
@@ -1,6 +1,6 @@
 // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
@@ -32,7 +32,7 @@ var Droppables = {
         options._containers.push($(containment));
       }
     }
-    
+
     if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE
@@ -40,34 +40,34 @@ var Droppables = {
 
     this.drops.push(options);
   },
-  
+
   findDeepestChild: function(drops) {
     deepest = drops[0];
-      
+
     for (i = 1; i < drops.length; ++i)
       if (Element.isParent(drops[i].element, deepest.element))
         deepest = drops[i];
-    
+
     return deepest;
   },
 
   isContained: function(element, drop) {
     var containmentNode;
     if(drop.tree) {
-      containmentNode = element.treeNode; 
+      containmentNode = element.treeNode;
     } else {
       containmentNode = element.parentNode;
     }
     return drop._containers.detect(function(c) { return containmentNode == c });
   },
-  
+
   isAffected: function(point, element, drop) {
     return (
       (drop.element!=element) &&
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||
-        (Element.classNames(element).detect( 
+        (Element.classNames(element).detect(
           function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, point[0], point[1]) );
   },
@@ -87,12 +87,12 @@ var Droppables = {
   show: function(point, element) {
     if(!this.drops.length) return;
     var drop, affected = [];
-    
+
     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });
-        
+
     if(affected.length>0)
       drop = Droppables.findDeepestChild(affected);
 
@@ -101,7 +101,7 @@ var Droppables = {
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
+
       if (drop != this.last_active) Droppables.activate(drop);
     }
   },
@@ -112,8 +112,8 @@ var Droppables = {
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
       if (this.last_active.onDrop) {
-        this.last_active.onDrop(element, this.last_active.element, event); 
-        return true; 
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;
       }
   },
 
@@ -126,20 +126,20 @@ var Droppables = {
 var Draggables = {
   drags: [],
   observers: [],
-  
+
   register: function(draggable) {
     if(this.drags.length == 0) {
       this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
       this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
       this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-      
+
       Event.observe(document, "mouseup", this.eventMouseUp);
       Event.observe(document, "mousemove", this.eventMouseMove);
       Event.observe(document, "keypress", this.eventKeypress);
     }
     this.drags.push(draggable);
   },
-  
+
   unregister: function(draggable) {
     this.drags = this.drags.reject(function(d) { return d==draggable });
     if(this.drags.length == 0) {
@@ -148,24 +148,24 @@ var Draggables = {
       Event.stopObserving(document, "keypress", this.eventKeypress);
     }
   },
-  
+
   activate: function(draggable) {
-    if(draggable.options.delay) { 
-      this._timeout = setTimeout(function() { 
-        Draggables._timeout = null; 
-        window.focus(); 
-        Draggables.activeDraggable = draggable; 
-      }.bind(this), draggable.options.delay); 
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
     } else {
       window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
       this.activeDraggable = draggable;
     }
   },
-  
+
   deactivate: function() {
     this.activeDraggable = null;
   },
-  
+
   updateDrag: function(event) {
     if(!this.activeDraggable) return;
     var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -173,36 +173,36 @@ var Draggables = {
     // the same coordinates, prevent needless redrawing (moz bug?)
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;
-    
+
     this.activeDraggable.updateDrag(event, pointer);
   },
-  
+
   endDrag: function(event) {
-    if(this._timeout) { 
-      clearTimeout(this._timeout); 
-      this._timeout = null; 
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
     }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
     this.activeDraggable.endDrag(event);
     this.activeDraggable = null;
   },
-  
+
   keyPress: function(event) {
     if(this.activeDraggable)
       this.activeDraggable.keyPress(event);
   },
-  
+
   addObserver: function(observer) {
     this.observers.push(observer);
     this._cacheObserverCallbacks();
   },
-  
+
   removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
     this._cacheObserverCallbacks();
   },
-  
+
   notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
     if(this[eventName+'Count'] > 0)
       this.observers.each( function(o) {
@@ -210,7 +210,7 @@ var Draggables = {
       });
     if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },
-  
+
   _cacheObserverCallbacks: function() {
     ['onStart','onEnd','onDrag'].each( function(eventName) {
       Draggables[eventName+'Count'] = Draggables.observers.select(
@@ -234,12 +234,12 @@ var Draggable = Class.create({
       },
       endeffect: function(element) {
         var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
           queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){ 
-            Draggable._dragging[element] = false 
+          afterFinish: function(){
+            Draggable._dragging[element] = false
           }
-        }); 
+        });
       },
       zindex: 1000,
       revert: false,
@@ -250,57 +250,57 @@ var Draggable = Class.create({
       snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
       delay: 0
     };
-    
+
     if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
           Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
         }
       });
-    
+
     var options = Object.extend(defaults, arguments[1] || { });
 
     this.element = $(element);
-    
+
     if(options.handle && Object.isString(options.handle))
       this.handle = this.element.down('.'+options.handle, 0);
-    
+
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
-    
+
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
       this._isScrollChild = Element.childOf(this.element, options.scroll);
     }
 
-    Element.makePositioned(this.element); // fix IE    
+    Element.makePositioned(this.element); // fix IE
 
     this.options  = options;
-    this.dragging = false;   
+    this.dragging = false;
 
     this.eventMouseDown = this.initDrag.bindAsEventListener(this);
     Event.observe(this.handle, "mousedown", this.eventMouseDown);
-    
+
     Draggables.register(this);
   },
-  
+
   destroy: function() {
     Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
     Draggables.unregister(this);
   },
-  
+
   currentDelta: function() {
     return([
       parseInt(Element.getStyle(this.element,'left') || '0'),
       parseInt(Element.getStyle(this.element,'top') || '0')]);
   },
-  
+
   initDrag: function(event) {
     if(!Object.isUndefined(Draggable._dragging[this.element]) &&
       Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
+    if(Event.isLeftClick(event)) {
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
       if((tag_name = src.tagName.toUpperCase()) && (
@@ -309,26 +309,26 @@ var Draggable = Class.create({
         tag_name=='OPTION' ||
         tag_name=='BUTTON' ||
         tag_name=='TEXTAREA')) return;
-        
+
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
       this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-      
+
       Draggables.activate(this);
       Event.stop(event);
     }
   },
-  
+
   startDrag: function(event) {
     this.dragging = true;
     if(!this.delta)
       this.delta = this.currentDelta();
-    
+
     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
       this.element.style.zIndex = this.options.zindex;
     }
-    
+
     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);
       this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
@@ -336,7 +336,7 @@ var Draggable = Class.create({
         Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }
-    
+
     if(this.options.scroll) {
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);
@@ -347,28 +347,28 @@ var Draggable = Class.create({
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }
-    
+
     Draggables.notify('onStart', this, event);
-        
+
     if(this.options.starteffect) this.options.starteffect(this.element);
   },
-  
+
   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);
-    
+
     if(!this.options.quiet){
       Position.prepare();
       Droppables.show(pointer, this.element);
     }
-    
+
     Draggables.notify('onDrag', this, event);
-    
+
     this.draw(pointer);
     if(this.options.change) this.options.change(this);
-    
+
     if(this.options.scroll) {
       this.stopScrolling();
-      
+
       var p;
       if (this.options.scroll == window) {
         with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
@@ -386,16 +386,16 @@ var Draggable = Class.create({
       if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
       this.startScrolling(speed);
     }
-    
+
     // fix AppleWebKit rendering
     if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-    
+
     Event.stop(event);
   },
-  
+
   finishDrag: function(event, success) {
     this.dragging = false;
-    
+
     if(this.options.quiet){
       Position.prepare();
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -410,17 +410,17 @@ var Draggable = Class.create({
       this._clone = null;
     }
 
-    var dropped = false; 
-    if(success) { 
-      dropped = Droppables.fire(event, this.element); 
-      if (!dropped) dropped = false; 
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;
     }
     if(dropped && this.options.onDropped) this.options.onDropped(this.element);
     Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
     if(revert && Object.isFunction(revert)) revert = revert(this.element);
-    
+
     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
       if (dropped == 0 || revert != 'failure')
@@ -433,45 +433,45 @@ var Draggable = Class.create({
     if(this.options.zindex)
       this.element.style.zIndex = this.originalZ;
 
-    if(this.options.endeffect) 
+    if(this.options.endeffect)
       this.options.endeffect(this.element);
-      
+
     Draggables.deactivate(this);
     Droppables.reset();
   },
-  
+
   keyPress: function(event) {
     if(event.keyCode!=Event.KEY_ESC) return;
     this.finishDrag(event, false);
     Event.stop(event);
   },
-  
+
   endDrag: function(event) {
     if(!this.dragging) return;
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
   },
-  
+
   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
     if(this.options.ghosting) {
       var r   = Position.realOffset(this.element);
       pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
     }
-    
+
     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];
-    
+
     if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
     }
-    
-    var p = [0,1].map(function(i){ 
-      return (point[i]-pos[i]-this.offset[i]) 
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])
     }.bind(this));
-    
+
     if(this.options.snap) {
       if(Object.isFunction(this.options.snap)) {
         p = this.options.snap(p[0],p[1],this);
@@ -484,16 +484,16 @@ var Draggable = Class.create({
           return (v/this.options.snap).round()*this.options.snap }.bind(this))
       }
     }}
-    
+
     var style = this.element.style;
     if((!this.options.constraint) || (this.options.constraint=='horizontal'))
       style.left = p[0] + "px";
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";
-    
+
     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },
-  
+
   stopScrolling: function() {
     if(this.scrollInterval) {
       clearInterval(this.scrollInterval);
@@ -501,14 +501,14 @@ var Draggable = Class.create({
       Draggables._lastScrollPointer = null;
     }
   },
-  
+
   startScrolling: function(speed) {
     if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
     this.scrollInterval = setInterval(this.scroll.bind(this), 10);
   },
-  
+
   scroll: function() {
     var current = new Date();
     var delta = current - this.lastScrolled;
@@ -524,7 +524,7 @@ var Draggable = Class.create({
       this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
       this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
     }
-    
+
     Position.prepare();
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);
@@ -538,10 +538,10 @@ var Draggable = Class.create({
         Draggables._lastScrollPointer[1] = 0;
       this.draw(Draggables._lastScrollPointer);
     }
-    
+
     if(this.options.change) this.options.change(this);
   },
-  
+
   _getWindowScroll: function(w) {
     var T, L, W, H;
     with (w.document) {
@@ -577,11 +577,11 @@ var SortableObserver = Class.create({
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
-  
+
   onStart: function() {
     this.lastValue = Sortable.serialize(this.element);
   },
-  
+
   onEnd: function() {
     Sortable.unmark();
     if(this.lastValue != Sortable.serialize(this.element))
@@ -591,11 +591,11 @@ var SortableObserver = Class.create({
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-  
+
   sortables: { },
-  
+
   _findRootElement: function(element) {
-    while (element.tagName.toUpperCase() != "BODY") {  
+    while (element.tagName.toUpperCase() != "BODY") {
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }
@@ -606,22 +606,22 @@ var Sortable = {
     if(!element) return;
     return Sortable.sortables[element.id];
   },
-  
+
   destroy: function(element){
     var s = Sortable.options(element);
-    
+
     if(s) {
       Draggables.removeObserver(s.element);
       s.droppables.each(function(d){ Droppables.remove(d) });
       s.draggables.invoke('destroy');
-      
+
       delete Sortable.sortables[s.element.id];
     }
   },
 
   create: function(element) {
     element = $(element);
-    var options = Object.extend({ 
+    var options = Object.extend({
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
       dropOnEmpty: false,
@@ -635,17 +635,17 @@ var Sortable = {
       delay:       0,
       hoverclass:  null,
       ghosting:    false,
-      quiet:       false, 
+      quiet:       false,
       scroll:      false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      this.SERIALIZE_RULE,
-      
-      // these take arrays of elements or ids and can be 
+
+      // these take arrays of elements or ids and can be
       // used for better initialization performance
       elements:    false,
       handles:     false,
-      
+
       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
     }, arguments[1] || { });
@@ -682,7 +682,7 @@ var Sortable = {
     if(options.zindex)
       options_for_draggable.zindex = options.zindex;
 
-    // build options for the droppables  
+    // build options for the droppables
     var options_for_droppable = {
       overlap:     options.overlap,
       containment: options.containment,
@@ -690,7 +690,7 @@ var Sortable = {
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover
     }
-    
+
     var options_for_tree = {
       onHover:      Sortable.onEmptyHover,
       overlap:      options.overlap,
@@ -699,7 +699,7 @@ var Sortable = {
     }
 
     // fix for gecko engine
-    Element.cleanWhitespace(element); 
+    Element.cleanWhitespace(element);
 
     options.draggables = [];
     options.droppables = [];
@@ -712,14 +712,14 @@ var Sortable = {
 
     (options.elements || this.findElements(element, options) || []).each( function(e,i) {
       var handle = options.handles ? $(options.handles[i]) :
-        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
       if(options.tree) e.treeNode = element;
-      options.droppables.push(e);      
+      options.droppables.push(e);
     });
-    
+
     if(options.tree) {
       (Sortable.findTreeElements(element, options) || []).each( function(e) {
         Droppables.add(e, options_for_tree);
@@ -741,7 +741,7 @@ var Sortable = {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.tag);
   },
-  
+
   findTreeElements: function(element, options) {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.treeTag);
@@ -758,7 +758,7 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, dropon);
-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
@@ -769,26 +769,26 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, nextElement);
-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     }
   },
-  
+
   onEmptyHover: function(element, dropon, overlap) {
     var oldParentNode = element.parentNode;
     var droponOptions = Sortable.options(dropon);
-        
+
     if(!Element.isParent(dropon, element)) {
       var index;
-      
+
       var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;
-            
+
       if(children) {
         var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-        
+
         for (index = 0; index < children.length; index += 1) {
           if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
             offset -= Element.offsetSize (children[index], droponOptions.overlap);
@@ -801,9 +801,9 @@ var Sortable = {
           }
         }
       }
-      
+
       dropon.insertBefore(element, child);
-      
+
       Sortable.options(oldParentNode).onChange(element);
       droponOptions.onChange(element);
     }
@@ -816,34 +816,34 @@ var Sortable = {
   mark: function(dropon, position) {
     // mark on ghosting only
     var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return; 
+    if(sortable && !sortable.ghosting) return;
 
     if(!Sortable._marker) {
-      Sortable._marker = 
+      Sortable._marker =
         ($('dropmarker') || Element.extend(document.createElement('DIV'))).
           hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }    
+    }
     var offsets = Position.cumulativeOffset(dropon);
     Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-    
+
     if(position=='after')
-      if(sortable.overlap == 'horizontal') 
+      if(sortable.overlap == 'horizontal')
         Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
         Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-    
+
     Sortable._marker.show();
   },
-  
+
   _tree: function(element, options, parent) {
     var children = Sortable.findElements(element, options) || [];
-  
+
     for (var i = 0; i < children.length; ++i) {
       var match = children[i].id.match(options.format);
 
       if (!match) continue;
-      
+
       var child = {
         id: encodeURIComponent(match ? match[1] : null),
         element: element,
@@ -852,15 +852,15 @@ var Sortable = {
         position: parent.children.length,
         container: $(children[i]).down(options.treeTag)
       }
-      
+
       /* Get the element containing the children and recurse over it */
       if (child.container)
         this._tree(child.container, options, child)
-      
+
       parent.children.push (child);
     }
 
-    return parent; 
+    return parent;
   },
 
   tree: function(element) {
@@ -873,7 +873,7 @@ var Sortable = {
       name: element.id,
       format: sortableOptions.format
     }, arguments[1] || { });
-    
+
     var root = {
       id: null,
       parent: null,
@@ -881,7 +881,7 @@ var Sortable = {
       container: element,
       position: 0
     }
-    
+
     return Sortable._tree(element, options, root);
   },
 
@@ -897,7 +897,7 @@ var Sortable = {
   sequence: function(element) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[1] || { });
-    
+
     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
@@ -906,14 +906,14 @@ var Sortable = {
   setSequence: function(element, new_sequence) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[2] || { });
-    
+
     var nodeMap = { };
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
         n.parentNode.removeChild(n);
     });
-   
+
     new_sequence.each(function(ident) {
       var n = nodeMap[ident];
       if (n) {
@@ -922,16 +922,16 @@ var Sortable = {
       }
     });
   },
-  
+
   serialize: function(element) {
     element = $(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || { });
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    
+
     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" + 
+        return [name + Sortable._constructIndex(item) + "[id]=" +
                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
     } else {
@@ -949,7 +949,7 @@ Element.isParent = function(child, element) {
   return Element.isParent(child.parentNode, element);
 }
 
-Element.findChildren = function(element, only, recursive, tagName) {   
+Element.findChildren = function(element, only, recursive, tagName) {
   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();
diff --git a/fixture_rails_root/public/javascripts/pebbles/effects.js b/fixture_rails_root/public/javascripts/pebbles/effects.js
index b8c0259..efa128f 100644
--- a/fixture_rails_root/public/javascripts/pebbles/effects.js
+++ b/fixture_rails_root/public/javascripts/pebbles/effects.js
@@ -5,46 +5,46 @@
 //  Justin Palmer (http://encytemedia.com/)
 //  Mark Pilgrim (http://diveintomark.org/)
 //  Martin Bialasinki
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/ 
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
-String.prototype.parseColor = function() {  
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
   var color = '#';
-  if (this.slice(0,4) == 'rgb(') {  
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
-  } else {  
-    if (this.slice(0,1) == '#') {  
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
-      if (this.length==7) color = this.toLowerCase();  
-    }  
-  }  
-  return (color.length==7 ? color : (arguments[0] || this));  
+  if (this.slice(0,4) == 'rgb(') {
+    var cols = this.slice(4,this.length-1).split(',');
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+  } else {
+    if (this.slice(0,1) == '#') {
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+      if (this.length==7) color = this.toLowerCase();
+    }
+  }
+  return (color.length==7 ? color : (arguments[0] || this));
 };
 
 /*--------------------------------------------------------------------------*/
 
-Element.collectTextNodes = function(element) {  
+Element.collectTextNodes = function(element) {
   return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
+    return (node.nodeType==3 ? node.nodeValue :
       (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
   }).flatten().join('');
 };
 
-Element.collectTextNodesIgnoreClass = function(element, className) {  
+Element.collectTextNodesIgnoreClass = function(element, className) {
   return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
+    return (node.nodeType==3 ? node.nodeValue :
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
         Element.collectTextNodesIgnoreClass(node, className) : ''));
   }).flatten().join('');
 };
 
 Element.setContentZoom = function(element, percent) {
-  element = $(element);  
-  element.setStyle({fontSize: (percent/100) + 'em'});   
+  element = $(element);
+  element.setStyle({fontSize: (percent/100) + 'em'});
   if (Prototype.Browser.WebKit) window.scrollBy(0,0);
   return element;
 };
@@ -84,16 +84,16 @@ var Effect = {
     wobble: function(pos) {
       return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
     },
-    pulse: function(pos, pulses) { 
-      pulses = pulses || 5; 
+    pulse: function(pos, pulses) {
+      pulses = pulses || 5;
       return (
-        ((pos % (1/pulses)) * pulses).round() == 0 ? 
-              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
+        ((pos % (1/pulses)) * pulses).round() == 0 ?
+              ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
           1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
         );
     },
-    spring: function(pos) { 
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
+    spring: function(pos) {
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
     },
     none: function(pos) {
       return 0;
@@ -114,14 +114,14 @@ var Effect = {
   tagifyText: function(element) {
     var tagifyStyle = 'position:relative';
     if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-    
+
     element = $(element);
     $A(element.childNodes).each( function(child) {
       if (child.nodeType==3) {
         child.nodeValue.toArray().each( function(character) {
           element.insertBefore(
             new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character), 
+              character == ' ' ? String.fromCharCode(160) : character),
               child);
         });
         Element.remove(child);
@@ -130,13 +130,13 @@ var Effect = {
   },
   multiple: function(element, effect) {
     var elements;
-    if (((typeof element == 'object') || 
-        Object.isFunction(element)) && 
+    if (((typeof element == 'object') ||
+        Object.isFunction(element)) &&
        (element.length))
       elements = element;
     else
       elements = $(element).childNodes;
-      
+
     var options = Object.extend({
       speed: 0.1,
       delay: 0.0
@@ -158,7 +158,7 @@ var Effect = {
     var options = Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
     }, arguments[2] || { });
-    Effect[element.visible() ? 
+    Effect[element.visible() ?
       Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
   }
 };
@@ -170,20 +170,20 @@ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
 Effect.ScopedQueue = Class.create(Enumerable, {
   initialize: function() {
     this.effects  = [];
-    this.interval = null;    
+    this.interval = null;
   },
   _each: function(iterator) {
     this.effects._each(iterator);
   },
   add: function(effect) {
     var timestamp = new Date().getTime();
-    
-    var position = Object.isString(effect.options.queue) ? 
+
+    var position = Object.isString(effect.options.queue) ?
       effect.options.queue : effect.options.queue.position;
-    
+
     switch(position) {
       case 'front':
-        // move unstarted effects after this effect  
+        // move unstarted effects after this effect
         this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
             e.startOn  += effect.finishOn;
             e.finishOn += effect.finishOn;
@@ -197,13 +197,13 @@ Effect.ScopedQueue = Class.create(Enumerable, {
         timestamp = this.effects.pluck('finishOn').max() || timestamp;
         break;
     }
-    
+
     effect.startOn  += timestamp;
     effect.finishOn += timestamp;
 
     if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
       this.effects.push(effect);
-    
+
     if (!this.interval)
       this.interval = setInterval(this.loop.bind(this), 15);
   },
@@ -216,7 +216,7 @@ Effect.ScopedQueue = Class.create(Enumerable, {
   },
   loop: function() {
     var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++) 
+    for(var i=0, len=this.effects.length;i<len;i++)
       this.effects[i] && this.effects[i].loop(timePos);
   }
 });
@@ -225,7 +225,7 @@ Effect.Queues = {
   instances: $H(),
   get: function(queueName) {
     if (!Object.isString(queueName)) return queueName;
-    
+
     return this.instances.get(queueName) ||
       this.instances.set(queueName, new Effect.ScopedQueue());
   }
@@ -250,11 +250,11 @@ Effect.Base = Class.create({
     this.fromToDelta  = this.options.to-this.options.from;
     this.totalTime    = this.finishOn-this.startOn;
     this.totalFrames  = this.options.fps*this.options.duration;
-    
+
     eval('this.render = function(pos){ '+
       'if (this.state=="idle"){this.state="running";'+
       codeForEvent(this.options,'beforeSetup')+
-      (this.setup ? 'this.setup();':'')+ 
+      (this.setup ? 'this.setup();':'')+
       codeForEvent(this.options,'afterSetup')+
       '};if (this.state=="running"){'+
       'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
@@ -263,10 +263,10 @@ Effect.Base = Class.create({
       (this.update ? 'this.update(pos);':'')+
       codeForEvent(this.options,'afterUpdate')+
       '}}');
-    
+
     this.event('beforeStart');
     if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
+      Effect.Queues.get(Object.isString(this.options.queue) ?
         'global' : this.options.queue.scope).add(this);
   },
   loop: function(timePos) {
@@ -275,9 +275,9 @@ Effect.Base = Class.create({
         this.render(1.0);
         this.cancel();
         this.event('beforeFinish');
-        if (this.finish) this.finish(); 
+        if (this.finish) this.finish();
         this.event('afterFinish');
-        return;  
+        return;
       }
       var pos   = (timePos - this.startOn) / this.totalTime,
           frame = (pos * this.totalFrames).round();
@@ -289,7 +289,7 @@ Effect.Base = Class.create({
   },
   cancel: function() {
     if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
+      Effect.Queues.get(Object.isString(this.options.queue) ?
         'global' : this.options.queue.scope).remove(this);
     this.state = 'finished';
   },
@@ -327,10 +327,10 @@ Effect.Parallel = Class.create(Effect.Base, {
 Effect.Tween = Class.create(Effect.Base, {
   initialize: function(object, from, to) {
     object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(), 
+    var args = $A(arguments), method = args.last(),
       options = args.length == 5 ? args[3] : null;
     this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) : 
+      Object.isFunction(object[method]) ? object[method].bind(object) :
       function(value) { object[method] = value };
     this.start(Object.extend({ from: from, to: to }, options || { }));
   },
@@ -394,7 +394,7 @@ Effect.Move = Class.create(Effect.Base, {
 
 // for backwards compatibility
 Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element, 
+  return new Effect.Move(element,
     Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
 };
 
@@ -416,15 +416,15 @@ Effect.Scale = Class.create(Effect.Base, {
   setup: function() {
     this.restoreAfterFinish = this.options.restoreAfterFinish || false;
     this.elementPositioning = this.element.getStyle('position');
-    
+
     this.originalStyle = { };
     ['top','left','width','height','fontSize'].each( function(k) {
       this.originalStyle[k] = this.element.style[k];
     }.bind(this));
-      
+
     this.originalTop  = this.element.offsetTop;
     this.originalLeft = this.element.offsetLeft;
-    
+
     var fontSize = this.element.getStyle('font-size') || '100%';
     ['em','px','%','pt'].each( function(fontSizeType) {
       if (fontSize.indexOf(fontSizeType)>0) {
@@ -432,9 +432,9 @@ Effect.Scale = Class.create(Effect.Base, {
         this.fontSizeType = fontSizeType;
       }
     }.bind(this));
-    
+
     this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-    
+
     this.dims = null;
     if (this.options.scaleMode=='box')
       this.dims = [this.element.offsetHeight, this.element.offsetWidth];
@@ -511,7 +511,7 @@ Effect.ScrollTo = function(element) {
   var options = arguments[1] || { },
     scrollOffsets = document.viewport.getScrollOffsets(),
     elementOffsets = $(element).cumulativeOffset(),
-    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
+    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
 
   if (options.offset) elementOffsets[1] += options.offset;
 
@@ -531,9 +531,9 @@ Effect.Fade = function(element) {
   var options = Object.extend({
     from: element.getOpacity() || 1.0,
     to:   0.0,
-    afterFinishInternal: function(effect) { 
+    afterFinishInternal: function(effect) {
       if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity}); 
+      effect.element.hide().setStyle({opacity: oldOpacity});
     }
   }, arguments[1] || { });
   return new Effect.Opacity(element,options);
@@ -549,15 +549,15 @@ Effect.Appear = function(element) {
     effect.element.forceRerendering();
   },
   beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show(); 
+    effect.element.setOpacity(effect.options.from).show();
   }}, arguments[1] || { });
   return new Effect.Opacity(element,options);
 };
 
 Effect.Puff = function(element) {
   element = $(element);
-  var oldStyle = { 
-    opacity: element.getInlineOpacity(), 
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
     position: element.getStyle('position'),
     top:  element.style.top,
     left: element.style.left,
@@ -565,10 +565,10 @@ Effect.Puff = function(element) {
     height: element.style.height
   };
   return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), 
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
+   [ new Effect.Scale(element, 200,
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+     Object.extend({ duration: 1.0,
       beforeSetupInternal: function(effect) {
         Position.absolutize(effect.effects[0].element)
       },
@@ -582,12 +582,12 @@ Effect.BlindUp = function(element) {
   element = $(element);
   element.makeClipping();
   return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
+    Object.extend({ scaleContent: false,
+      scaleX: false,
       restoreAfterFinish: true,
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping();
-      } 
+      }
     }, arguments[1] || { })
   );
 };
@@ -595,15 +595,15 @@ Effect.BlindUp = function(element) {
 Effect.BlindDown = function(element) {
   element = $(element);
   var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
     scaleX: false,
     scaleFrom: 0,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
     afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },  
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
     afterFinishInternal: function(effect) {
       effect.element.undoClipping();
     }
@@ -618,10 +618,10 @@ Effect.SwitchOff = function(element) {
     from: 0,
     transition: Effect.Transitions.flicker,
     afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, { 
+      new Effect.Scale(effect.element, 1, {
         duration: 0.3, scaleFromCenter: true,
         scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) { 
+        beforeSetup: function(effect) {
           effect.element.makePositioned().makeClipping();
         },
         afterFinishInternal: function(effect) {
@@ -639,16 +639,16 @@ Effect.DropOut = function(element) {
     left: element.getStyle('left'),
     opacity: element.getInlineOpacity() };
   return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
       new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
     Object.extend(
       { duration: 0.5,
         beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned(); 
+          effect.effects[0].element.makePositioned();
         },
         afterFinishInternal: function(effect) {
           effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        } 
+        }
       }, arguments[1] || { }));
 };
 
@@ -684,9 +684,9 @@ Effect.SlideDown = function(element) {
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
   var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false, 
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
     scaleFrom: window.opera ? 0 : 1,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
@@ -694,11 +694,11 @@ Effect.SlideDown = function(element) {
       effect.element.makePositioned();
       effect.element.down().makePositioned();
       if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
     },
     afterUpdateInternal: function(effect) {
       effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
     },
     afterFinishInternal: function(effect) {
       effect.element.undoClipping().undoPositioned();
@@ -712,8 +712,8 @@ Effect.SlideUp = function(element) {
   var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false, 
+   Object.extend({ scaleContent: false,
+    scaleX: false,
     scaleMode: 'box',
     scaleFrom: 100,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
@@ -723,7 +723,7 @@ Effect.SlideUp = function(element) {
       effect.element.down().makePositioned();
       if (window.opera) effect.element.setStyle({top: ''});
       effect.element.makeClipping().show();
-    },  
+    },
     afterUpdateInternal: function(effect) {
       effect.element.down().setStyle({bottom:
         (effect.dims[0] - effect.element.clientHeight) + 'px' });
@@ -736,15 +736,15 @@ Effect.SlideUp = function(element) {
   );
 };
 
-// Bug in opera makes the TD containing this element expand for a instance after finish 
+// Bug in opera makes the TD containing this element expand for a instance after finish
 Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, { 
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
     restoreAfterFinish: true,
     beforeSetup: function(effect) {
-      effect.element.makeClipping(); 
-    },  
+      effect.element.makeClipping();
+    },
     afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping(); 
+      effect.element.hide().undoClipping();
     }
   });
 };
@@ -764,13 +764,13 @@ Effect.Grow = function(element) {
     width: element.style.width,
     opacity: element.getInlineOpacity() };
 
-  var dims = element.getDimensions();    
+  var dims = element.getDimensions();
   var initialMoveX, initialMoveY;
   var moveX, moveY;
-  
+
   switch (options.direction) {
     case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0; 
+      initialMoveX = initialMoveY = moveX = moveY = 0;
       break;
     case 'top-right':
       initialMoveX = dims.width;
@@ -795,11 +795,11 @@ Effect.Grow = function(element) {
       moveY = -dims.height / 2;
       break;
   }
-  
+
   return new Effect.Move(element, {
     x: initialMoveX,
     y: initialMoveY,
-    duration: 0.01, 
+    duration: 0.01,
     beforeSetup: function(effect) {
       effect.element.hide().makeClipping().makePositioned();
     },
@@ -808,14 +808,14 @@ Effect.Grow = function(element) {
         [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
           new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
           new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, 
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
             sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
         ], Object.extend({
              beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show(); 
+               effect.effects[0].element.setStyle({height: '0px'}).show();
              },
              afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
              }
            }, options)
       )
@@ -840,7 +840,7 @@ Effect.Shrink = function(element) {
 
   var dims = element.getDimensions();
   var moveX, moveY;
-  
+
   switch (options.direction) {
     case 'top-left':
       moveX = moveY = 0;
@@ -857,19 +857,19 @@ Effect.Shrink = function(element) {
       moveX = dims.width;
       moveY = dims.height;
       break;
-    case 'center':  
+    case 'center':
       moveX = dims.width / 2;
       moveY = dims.height / 2;
       break;
   }
-  
+
   return new Effect.Parallel(
     [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
       new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
       new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({            
+    ], Object.extend({
          beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping(); 
+           effect.effects[0].element.makePositioned().makeClipping();
          },
          afterFinishInternal: function(effect) {
            effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
@@ -884,7 +884,7 @@ Effect.Pulsate = function(element) {
   var transition = options.transition || Effect.Transitions.sinoidal;
   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
   reverser.bind(transition);
-  return new Effect.Opacity(element, 
+  return new Effect.Opacity(element,
     Object.extend(Object.extend({  duration: 2.0, from: 0,
       afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
     }, options), {transition: reverser}));
@@ -898,12 +898,12 @@ Effect.Fold = function(element) {
     width: element.style.width,
     height: element.style.height };
   element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({   
+  return new Effect.Scale(element, 5, Object.extend({
     scaleContent: false,
     scaleX: false,
     afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, { 
-      scaleContent: false, 
+    new Effect.Scale(element, 1, {
+      scaleContent: false,
       scaleY: false,
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping().setStyle(oldStyle);
@@ -918,7 +918,7 @@ Effect.Morph = Class.create(Effect.Base, {
     var options = Object.extend({
       style: { }
     }, arguments[1] || { });
-    
+
     if (!Object.isString(options.style)) this.style = $H(options.style);
     else {
       if (options.style.include(':'))
@@ -941,13 +941,13 @@ Effect.Morph = Class.create(Effect.Base, {
     }
     this.start(options);
   },
-  
+
   setup: function(){
     function parseColor(color){
       if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
       color = color.parseColor();
       return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
+        return parseInt( color.slice(i*2+1,i*2+3), 16 )
       });
     }
     this.transforms = this.style.map(function(pair){
@@ -967,9 +967,9 @@ Effect.Morph = Class.create(Effect.Base, {
       }
 
       var originalValue = this.element.getStyle(property);
-      return { 
-        style: property.camelize(), 
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
+      return {
+        style: property.camelize(),
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
         targetValue: unit=='color' ? parseColor(value) : value,
         unit: unit
       };
@@ -986,7 +986,7 @@ Effect.Morph = Class.create(Effect.Base, {
   update: function(position) {
     var style = { }, transform, i = this.transforms.length;
     while(i--)
-      style[(transform = this.transforms[i]).style] = 
+      style[(transform = this.transforms[i]).style] =
         transform.unit=='color' ? '#'+
           (Math.round(transform.originalValue[0]+
             (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
@@ -995,7 +995,7 @@ Effect.Morph = Class.create(Effect.Base, {
           (Math.round(transform.originalValue[2]+
             (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
         (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
             (transform.unit === null ? '' : transform.unit);
     this.element.setStyle(style, true);
   }
@@ -1032,7 +1032,7 @@ Effect.Transform = Class.create({
 });
 
 Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
   'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
   'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
   'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
@@ -1041,7 +1041,7 @@ Element.CSS_PROPERTIES = $w(
   'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
   'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
   'right textIndent top width wordSpacing zIndex');
-  
+
 Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
 
 String.__parseStyleElement = document.createElement('div');
@@ -1053,11 +1053,11 @@ String.prototype.parseStyle = function(){
     String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
     style = String.__parseStyleElement.childNodes[0].style;
   }
-  
+
   Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]); 
+    if (style[property]) styleRules.set(property, style[property]);
   });
-  
+
   if (Prototype.Browser.IE && this.include('opacity'))
     styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
 
@@ -1106,7 +1106,7 @@ Effect.Methods = {
 
 $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
   'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) { 
+  function(effect) {
     Effect.Methods[effect] = function(element, options){
       element = $(element);
       Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
@@ -1115,7 +1115,7 @@ $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
   }
 );
 
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
   function(f) { Effect.Methods[f] = Element[f]; }
 );
 
diff --git a/fixture_rails_root/public/javascripts/pebbles/geoRssOverlay.js b/fixture_rails_root/public/javascripts/pebbles/geoRssOverlay.js
index 315c26d..99cdb1d 100644
--- a/fixture_rails_root/public/javascripts/pebbles/geoRssOverlay.js
+++ b/fixture_rails_root/public/javascripts/pebbles/geoRssOverlay.js
@@ -78,8 +78,8 @@ GeoRssOverlay.prototype.copy = function(){
 }
 
 GeoRssOverlay.prototype.load=function() {
-    if (this.request != false) { 
-	return; 
+    if (this.request != false) {
+	return;
     }
     this.request = GXmlHttp.create();
     if (this.proxyurl != undefined) {
@@ -121,7 +121,7 @@ GeoRssOverlay.prototype.callback = function() {
 }
 
 GeoRssOverlay.prototype.createMarker = function(item,index) {
-    
+
     var title = item.getElementsByTagName("title")[0].childNodes[0].nodeValue;
     if(item.getElementsByTagName("description").length != 0){
 	//Rss
@@ -138,14 +138,14 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    var lat = item.getElementsByTagNameNS("http://www.w3.org/2003/01/geo/wgs84_pos#","lat")[0].childNodes[0].nodeValue;
 	    var lng = item.getElementsByTagNameNS("http://www.w3.org/2003/01/geo/wgs84_pos#","long")[0].childNodes[0].nodeValue;
 	}else if(item.getElementsByTagNameNS("http://www.georss.org/georss","point").length != 0){
-	    
+
 	    //Simple
 	    var latlng = item.getElementsByTagNameNS("http://www.georss.org/georss","point")[0].childNodes[0].nodeValue.split(" ");
 	    var lat = latlng[0];
 	    var lng = latlng[1];
 	}
     } else {
-	
+
 	if(item.getElementsByTagName("geo:lat").length != 0){
 	    //W3C Geo Vocabulary
 	    var lat = item.getElementsByTagName("geo:lat")[0].childNodes[0].nodeValue;
@@ -157,11 +157,11 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    var lng = latlng[1];
 	}
     }
-    
+
     var point = new GLatLng(parseFloat(lat), parseFloat(lng));
     var marker = new GMarker(point,{'title': title});
     var html = "<a href=\"" + link + "\">" + title + "</a><p/>" + description;
-    
+
     if(this.contentDiv == undefined){
 	GEvent.addListener(marker, "click", function() {
 	    marker.openInfoWindowHtml(html);
@@ -172,9 +172,9 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    document.getElementById(contentDiv).innerHTML = html;
 	});
     }
-    
+
     if(this.listDiv != undefined){
-	var a = document.createElement('a'); 
+	var a = document.createElement('a');
 	a.innerHTML = title;
 	a.setAttribute("href","#");
 	var georss = this;
@@ -189,6 +189,6 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	div.appendChild(a);
 	document.getElementById(this.listDiv).appendChild(div);
     }
-    
+
     return marker;
 }
diff --git a/fixture_rails_root/public/javascripts/pebbles/jquery/creditcard2.js b/fixture_rails_root/public/javascripts/pebbles/jquery/creditcard2.js
index 3f92058..2e6e63f 100644
--- a/fixture_rails_root/public/javascripts/pebbles/jquery/creditcard2.js
+++ b/fixture_rails_root/public/javascripts/pebbles/jquery/creditcard2.js
@@ -17,10 +17,10 @@
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
 */
- 
+
 jQuery.validator.addMethod("creditcard2", function(value, element, param) {
-	var cardName = param;	
-	
+	var cardName = param;
+
 	var cards = new Array();
 	cards [0] = {cardName: "Visa", lengths: "13,16", prefixes: "4", checkdigit: true};
 	cards [1] = {cardName: "master", lengths: "16", prefixes: "51,52,53,54,55", checkdigit: true};
@@ -34,23 +34,23 @@ jQuery.validator.addMethod("creditcard2", function(value, element, param) {
 	cards [9] = {cardName: "Switch", lengths: "16,18,19", prefixes: "4903,4905,4911,4936,564182,633110,6333,6759", checkdigit: true};
 	cards [10] = {cardName: "Maestro", lengths: "16,18", prefixes: "5020,6", checkdigit: true};
 	cards [11] = {cardName: "VisaElectron", lengths: "16", prefixes: "417500,4917,4913", checkdigit: true};
-  			   
+
 	var cardType = -1;
 	for (var i=0; i<cards.length; i++) {
 		if (cardName.toLowerCase() == cards[i].cardName.toLowerCase()) {
 			cardType = i;
 			break;
 		}
-	}	
+	}
 	if (cardType == -1) { return false; } // card type not found
-  
+
 	value = value.replace (/[\s-]/g, ""); // remove spaces and dashes
 	if (value.length == 0) { return false; } // no length
 
 	var cardNo = value;
 	var cardexp = /^[0-9]{13,19}$/;
 	if (!cardexp.exec(cardNo)) { return false; } // has chars or wrong length
-	
+
 	cardNo = cardNo.replace(/\D/g, ""); // strip down to digits
 
 	if (cards[cardType].checkdigit){
@@ -67,13 +67,13 @@ jQuery.validator.addMethod("creditcard2", function(value, element, param) {
 			}
 			checksum = checksum + calc;
 			if (j ==1) {j = 2} else {j = 1};
-		} 
+		}
 
 		if (checksum % 10 != 0) { return false; } // not mod10
-	}  
+	}
 
 	var lengthValid = false;
-	var prefixValid = false; 
+	var prefixValid = false;
 	var prefix = new Array ();
 	var lengths = new Array ();
 
diff --git a/fixture_rails_root/public/javascripts/pebbles/jquery/livequery.js b/fixture_rails_root/public/javascripts/pebbles/jquery/livequery.js
index dde8ad8..ea5899c 100755
--- a/fixture_rails_root/public/javascripts/pebbles/jquery/livequery.js
+++ b/fixture_rails_root/public/javascripts/pebbles/jquery/livequery.js
@@ -1,5 +1,5 @@
 /*! Copyright (c) 2008 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
  * Version: 1.0.3
@@ -8,15 +8,15 @@
  */
 
 (function($) {
-	
+
 $.extend($.fn, {
 	livequery: function(type, fn, fn2) {
 		var self = this, q;
-		
+
 		// Handle different call patterns
 		if ($.isFunction(type))
 			fn2 = fn, fn = type, type = undefined;
-			
+
 		// See if Live Query already exists
 		$.each( $.livequery.queries, function(i, query) {
 			if ( self.selector == query.selector && self.context == query.context &&
@@ -24,34 +24,34 @@ $.extend($.fn, {
 					// Found the query, exit the each loop
 					return (q = query) && false;
 		});
-		
+
 		// Create new Live Query if it wasn't found
 		q = q || new $.livequery(this.selector, this.context, type, fn, fn2);
-		
+
 		// Make sure it is running
 		q.stopped = false;
-		
+
 		// Run it immediately for the first time
 		q.run();
-		
+
 		// Contnue the chain
 		return this;
 	},
-	
+
 	expire: function(type, fn, fn2) {
 		var self = this;
-		
+
 		// Handle different call patterns
 		if ($.isFunction(type))
 			fn2 = fn, fn = type, type = undefined;
-			
+
 		// Find the Live Query based on arguments and stop it
 		$.each( $.livequery.queries, function(i, query) {
-			if ( self.selector == query.selector && self.context == query.context && 
+			if ( self.selector == query.selector && self.context == query.context &&
 				(!type || type == query.type) && (!fn || fn.$lqguid == query.fn.$lqguid) && (!fn2 || fn2.$lqguid == query.fn2.$lqguid) && !this.stopped )
 					$.livequery.stop(query.id);
 		});
-		
+
 		// Continue the chain
 		return this;
 	}
@@ -65,14 +65,14 @@ $.livequery = function(selector, context, type, fn, fn2) {
 	this.fn2      = fn2;
 	this.elements = [];
 	this.stopped  = false;
-	
+
 	// The id is the index of the Live Query in $.livequery.queries
 	this.id = $.livequery.queries.push(this)-1;
-	
+
 	// Mark the functions for matching later on
 	fn.$lqguid = fn.$lqguid || $.livequery.guid++;
 	if (fn2) fn2.$lqguid = fn2.$lqguid || $.livequery.guid++;
-	
+
 	// Return the Live Query
 	return this;
 };
@@ -80,7 +80,7 @@ $.livequery = function(selector, context, type, fn, fn2) {
 $.livequery.prototype = {
 	stop: function() {
 		var query = this;
-		
+
 		if ( this.type )
 			// Unbind all bound events
 			this.elements.unbind(this.type, this.fn);
@@ -89,30 +89,30 @@ $.livequery.prototype = {
 			this.elements.each(function(i, el) {
 				query.fn2.apply(el);
 			});
-			
+
 		// Clear out matched elements
 		this.elements = [];
-		
+
 		// Stop the Live Query from running until restarted
 		this.stopped = true;
 	},
-	
+
 	run: function() {
 		// Short-circuit if stopped
 		if ( this.stopped ) return;
 		var query = this;
-		
+
 		var oEls = this.elements,
 			els  = $(this.selector, this.context),
 			nEls = els.not(oEls);
-		
+
 		// Set elements to the latest set of matched elements
 		this.elements = els;
-		
+
 		if (this.type) {
 			// Bind events to newly matched elements
 			nEls.bind(this.type, this.fn);
-			
+
 			// Unbind events to elements no longer matched
 			if (oEls.length > 0)
 				$.each(oEls, function(i, el) {
@@ -125,7 +125,7 @@ $.livequery.prototype = {
 			nEls.each(function() {
 				query.fn.apply(this);
 			});
-			
+
 			// Call the second function for elements no longer matched
 			if ( this.fn2 && oEls.length > 0 )
 				$.each(oEls, function(i, el) {
@@ -142,7 +142,7 @@ $.extend($.livequery, {
 	queue: [],
 	running: false,
 	timeout: null,
-	
+
 	checkQueue: function() {
 		if ( $.livequery.running && $.livequery.queue.length ) {
 			var length = $.livequery.queue.length;
@@ -151,41 +151,41 @@ $.extend($.livequery, {
 				$.livequery.queries[ $.livequery.queue.shift() ].run();
 		}
 	},
-	
+
 	pause: function() {
 		// Don't run anymore Live Queries until restarted
 		$.livequery.running = false;
 	},
-	
+
 	play: function() {
 		// Restart Live Queries
 		$.livequery.running = true;
 		// Request a run of the Live Queries
 		$.livequery.run();
 	},
-	
+
 	registerPlugin: function() {
 		$.each( arguments, function(i,n) {
 			// Short-circuit if the method doesn't exist
 			if (!$.fn[n]) return;
-			
+
 			// Save a reference to the original method
 			var old = $.fn[n];
-			
+
 			// Create a new method
 			$.fn[n] = function() {
 				// Call the original method
 				var r = old.apply(this, arguments);
-				
+
 				// Request a run of the Live Queries
 				$.livequery.run();
-				
+
 				// Return the original methods result
 				return r;
 			}
 		});
 	},
-	
+
 	run: function(id) {
 		if (id != undefined) {
 			// Put the particular Live Query in the queue if it doesn't already exist
@@ -198,13 +198,13 @@ $.extend($.livequery, {
 				if ( $.inArray(id, $.livequery.queue) < 0 )
 					$.livequery.queue.push( id );
 			});
-		
+
 		// Clear timeout if it already exists
 		if ($.livequery.timeout) clearTimeout($.livequery.timeout);
 		// Create a timeout to check the queue and actually run the Live Queries
 		$.livequery.timeout = setTimeout($.livequery.checkQueue, 20);
 	},
-	
+
 	stop: function(id) {
 		if (id != undefined)
 			// Stop are particular Live Query
@@ -231,20 +231,20 @@ var init = $.prototype.init;
 $.prototype.init = function(a,c) {
 	// Call the original init and save the result
 	var r = init.apply(this, arguments);
-	
+
 	// Copy over properties if they exist already
 	if (a && a.selector)
 		r.context = a.context, r.selector = a.selector;
-		
+
 	// Set properties
 	if ( typeof a == 'string' )
 		r.context = c || document, r.selector = a;
-	
+
 	// Return the result
 	return r;
 };
 
 // Give the init function the jQuery prototype for later instantiation (needed after Rev 4091)
 $.prototype.init.prototype = $.prototype;
-	
+
 })(jQuery);
\ No newline at end of file
diff --git a/fixture_rails_root/public/javascripts/pebbles/jquery/spinner.js b/fixture_rails_root/public/javascripts/pebbles/jquery/spinner.js
index bde9f44..9520881 100644
--- a/fixture_rails_root/public/javascripts/pebbles/jquery/spinner.js
+++ b/fixture_rails_root/public/javascripts/pebbles/jquery/spinner.js
@@ -2,7 +2,7 @@ jQuery(document).ready(function(){
   jQuery("body").spin().unspin(); // Weird "image not showing" bug. :-( Need a better solution
 })
 if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
- 
+
 (function($){
   $.extend({
     Spinner: {
@@ -29,7 +29,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
                     }
       }
     });
-    
+
   $.fn.spin = function(){
     var defaults = {
       className: $.Spinner.className,
@@ -37,9 +37,9 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
       spinnerID: $.Spinner.spinnerID
       }
     var settings = $.extend(defaults, arguments.length != 0 ? arguments[0] : {});
- 
+
     (settings.unspinOthers && $.Spinner.unspin());
-    
+
     return this.each(function(){
       var spun = $(this);
       if((spinner = $("#"+spun.attr("spinner"))) && spinner.get(0)){
@@ -47,7 +47,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
         $.Spinner.logger("Already spinning.");
         return jQuery;
       }
-        
+
       var spinnerID = $.Spinner.spinnerID + String(Math.random()).substring(2);
       $("body")
         .append(
@@ -63,7 +63,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
       spun.attr({spinner: spinnerID}); // Keep track of the spinner for the element
     });
   };
-  
+
   $.fn.unspin = function(){
     return this.each(function(){
       $("#"+$(this).attr("spinner")).hide();
diff --git a/fixture_rails_root/public/javascripts/pebbles/jquery/validate.js b/fixture_rails_root/public/javascripts/pebbles/jquery/validate.js
index 307476f..251188d 100644
--- a/fixture_rails_root/public/javascripts/pebbles/jquery/validate.js
+++ b/fixture_rails_root/public/javascripts/pebbles/jquery/validate.js
@@ -30,30 +30,30 @@ $.extend($.fn, {
 		if ( validator ) {
 			return validator;
 		}
-		
+
 		validator = new $.validator( options, this[0] );
-		$.data(this[0], 'validator', validator); 
-		
+		$.data(this[0], 'validator', validator);
+
 		if ( validator.settings.onsubmit ) {
-		
+
 			// allow suppresing validation by adding a cancel class to the submit button
 			this.find("input, button").filter(".cancel").click(function() {
 				validator.cancelSubmit = true;
 			});
-			
+
 			// when a submitHandler is used, capture the submitting button
 			if (validator.settings.submitHandler) {
 				this.find("input, button").filter(":submit").click(function() {
 					validator.submitButton = this;
 				});
 			}
-		
+
 			// validate the form on submit
 			this.submit( function( event ) {
 				if ( validator.settings.debug )
 					// prevent form submit to be able to see console output
 					event.preventDefault();
-					
+
 				function handle() {
 					if ( validator.settings.submitHandler ) {
 						if (validator.submitButton) {
@@ -69,7 +69,7 @@ $.extend($.fn, {
 					}
 					return true;
 				}
-					
+
 				// prevent submit for invalid forms or custom submit handlers
 				if ( validator.cancelSubmit ) {
 					validator.cancelSubmit = false;
@@ -87,7 +87,7 @@ $.extend($.fn, {
 				}
 			});
 		}
-		
+
 		return validator;
 	},
 	// http://docs.jquery.com/Plugins/Validation/valid
@@ -116,7 +116,7 @@ $.extend($.fn, {
 	// http://docs.jquery.com/Plugins/Validation/rules
 	rules: function(command, argument) {
 		var element = this[0];
-		
+
 		if (command) {
 			var settings = $.data(element.form, 'validator').settings;
 			var staticRules = settings.rules;
@@ -141,7 +141,7 @@ $.extend($.fn, {
 				return filtered;
 			}
 		}
-		
+
 		var data = $.validator.normalizeRules(
 		$.extend(
 			{},
@@ -150,14 +150,14 @@ $.extend($.fn, {
 			$.validator.attributeRules(element),
 			$.validator.staticRules(element)
 		), element);
-		
+
 		// make sure required is at front
 		if (data.required) {
 			var param = data.required;
 			delete data.required;
 			data = $.extend({required: param}, data);
 		}
-		
+
 		return data;
 	}
 });
@@ -180,7 +180,7 @@ $.validator = function( options, form ) {
 };
 
 $.validator.format = function(source, params) {
-	if ( arguments.length == 1 ) 
+	if ( arguments.length == 1 )
 		return function() {
 			var args = $.makeArray(arguments);
 			args.unshift(source);
@@ -199,7 +199,7 @@ $.validator.format = function(source, params) {
 };
 
 $.extend($.validator, {
-	
+
 	defaults: {
 		messages: {},
 		groups: {},
@@ -215,7 +215,7 @@ $.extend($.validator, {
 		ignoreTitle: false,
 		onfocusin: function(element) {
 			this.lastActive = element;
-				
+
 			// hide error label and remove error class on focus if enabled
 			if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
 				this.settings.unhighlight && this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
@@ -270,11 +270,11 @@ $.extend($.validator, {
 		max: $.validator.format("Please enter a value less than or equal to {0}."),
 		min: $.validator.format("Please enter a value greater than or equal to {0}.")
 	},
-	
+
 	autoCreateRanges: false,
-	
+
 	prototype: {
-		
+
 		init: function() {
 			this.labelContainer = $(this.settings.errorLabelContainer);
 			this.errorContext = this.labelContainer.length && this.labelContainer || $(this.currentForm);
@@ -285,7 +285,7 @@ $.extend($.validator, {
 			this.pending = {};
 			this.invalid = {};
 			this.reset();
-			
+
 			var groups = (this.groups = {});
 			$.each(this.settings.groups, function(key, value) {
 				$.each(value.split(/\s/), function(index, name) {
@@ -296,7 +296,7 @@ $.extend($.validator, {
 			$.each(rules, function(key, value) {
 				rules[key] = $.validator.normalizeRule(value);
 			});
-			
+
 			function delegate(event) {
 				var validator = $.data(this[0].form, "validator");
 				validator.settings["on" + event.type] && validator.settings["on" + event.type].call(validator, this[0] );
@@ -319,15 +319,15 @@ $.extend($.validator, {
 			this.showErrors();
 			return this.valid();
 		},
-		
+
 		checkForm: function() {
 			this.prepareForm();
 			for ( var i = 0, elements = (this.currentElements = this.elements()); elements[i]; i++ ) {
 				this.check( elements[i] );
 			}
-			return this.valid(); 
+			return this.valid();
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Validator/element
 		element: function( element ) {
 			element = this.clean( element );
@@ -369,7 +369,7 @@ $.extend($.validator, {
 				? this.settings.showErrors.call( this, this.errorMap, this.errorList )
 				: this.defaultShowErrors();
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Validator/resetForm
 		resetForm: function() {
 			if ( $.fn.resetForm )
@@ -379,30 +379,30 @@ $.extend($.validator, {
 			this.hideErrors();
 			this.elements().removeClass( this.settings.errorClass );
 		},
-		
+
 		numberOfInvalids: function() {
 			return this.objectLength(this.invalid);
 		},
-		
+
 		objectLength: function( obj ) {
 			var count = 0;
 			for ( var i in obj )
 				count++;
 			return count;
 		},
-		
+
 		hideErrors: function() {
 			this.addWrapper( this.toHide ).hide();
 		},
-		
+
 		valid: function() {
 			return this.size() == 0;
 		},
-		
+
 		size: function() {
 			return this.errorList.length;
 		},
-		
+
 		focusInvalid: function() {
 			if( this.settings.focusInvalid ) {
 				try {
@@ -412,18 +412,18 @@ $.extend($.validator, {
 				}
 			}
 		},
-		
+
 		findLastActive: function() {
 			var lastActive = this.lastActive;
 			return lastActive && $.grep(this.errorList, function(n) {
 				return n.element.name == lastActive.name;
 			}).length == 1 && lastActive;
 		},
-		
+
 		elements: function() {
 			var validator = this,
 				rulesCache = {};
-			
+
 			// select all valid inputs inside the form (no submit or reset buttons)
 			// workaround $Query([]).add until http://dev.jquery.com/ticket/2114 is solved
 			return $([]).add(this.currentForm.elements)
@@ -432,24 +432,24 @@ $.extend($.validator, {
 			.not( this.settings.ignore )
 			.filter(function() {
 				!this.name && validator.settings.debug && window.console && console.error( "%o has no name assigned", this);
-			
+
 				// select only the first element for each name, and only those with rules specified
 				if ( this.name in rulesCache || !validator.objectLength($(this).rules()) )
 					return false;
-				
+
 				rulesCache[this.name] = true;
 				return true;
 			});
 		},
-		
+
 		clean: function( selector ) {
 			return $( selector )[0];
 		},
-		
+
 		errors: function() {
 			return $( this.settings.errorElement + "." + this.settings.errorClass, this.errorContext );
 		},
-		
+
 		reset: function() {
 			this.successList = [];
 			this.errorList = [];
@@ -459,32 +459,32 @@ $.extend($.validator, {
 			this.formSubmitted = false;
 			this.currentElements = $([]);
 		},
-		
+
 		prepareForm: function() {
 			this.reset();
 			this.toHide = this.errors().add( this.containers );
 		},
-		
+
 		prepareElement: function( element ) {
 			this.reset();
 			this.toHide = this.errorsFor(element);
 		},
-	
+
 		check: function( element ) {
 			element = this.clean( element );
-			
+
 			// if radio/checkbox, validate first element in group instead
 			if (this.checkable(element)) {
 				element = this.findByName( element.name )[0];
 			}
-			
+
 			var rules = $(element).rules();
 			var dependencyMismatch = false;
 			for( method in rules ) {
 				var rule = { method: method, parameters: rules[method] };
 				try {
 					var result = $.validator.methods[method].call( this, element.value.replace(/\r/g, ""), element, rule.parameters );
-					
+
 					// if a method indicates that the field is optional and therefore valid,
 					// don't mark it as valid when there are no other rules
 					if ( result == "dependency-mismatch" ) {
@@ -492,12 +492,12 @@ $.extend($.validator, {
 						continue;
 					}
 					dependencyMismatch = false;
-					
+
 					if ( result == "pending" ) {
 						this.toHide = this.toHide.not( this.errorsFor(element) );
 						return;
 					}
-					
+
 					if( !result ) {
 						this.formatAndAdd( element, rule );
 						return false;
@@ -514,20 +514,20 @@ $.extend($.validator, {
 				this.successList.push(element);
 			return true;
 		},
-		
+
 		// return the custom message for the given element and validation method
 		// specified in the element's "messages" metadata
 		customMetaMessage: function(element, method) {
 			if (!$.metadata)
 				return;
-			
+
 			var meta = this.settings.meta
 				? $(element).metadata()[this.settings.meta]
 				: $(element).metadata();
-			
+
 			return meta && meta.messages && meta.messages[method];
 		},
-		
+
 		// return the custom message for the given element name and validation method
 		customMessage: function( name, method ) {
 			var m = this.settings.messages[name];
@@ -535,7 +535,7 @@ $.extend($.validator, {
 				? m
 				: m[method]);
 		},
-		
+
 		// return the first defined argument, allowing empty strings
 		findDefined: function() {
 			for(var i = 0; i < arguments.length; i++) {
@@ -544,7 +544,7 @@ $.extend($.validator, {
 			}
 			return undefined;
 		},
-		
+
 		defaultMessage: function( element, method) {
 			return this.findDefined(
 				this.customMessage( element.name, method ),
@@ -555,10 +555,10 @@ $.extend($.validator, {
 				"<strong>Warning: No message defined for " + element.name + "</strong>"
 			);
 		},
-		
+
 		formatAndAdd: function( element, rule ) {
 			var message = this.defaultMessage( element, rule.method );
-			if ( typeof message == "function" ) 
+			if ( typeof message == "function" )
 				message = message.call(this, rule.parameters, element);
 			this.errorList.push({
 				message: message,
@@ -567,13 +567,13 @@ $.extend($.validator, {
 			this.errorMap[element.name] = message;
 			this.submitted[element.name] = message;
 		},
-		
+
 		addWrapper: function(toToggle) {
 			if ( this.settings.wrapper )
 				toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
 			return toToggle;
 		},
-		
+
 		defaultShowErrors: function() {
 			for ( var i = 0; this.errorList[i]; i++ ) {
 				var error = this.errorList[i];
@@ -597,23 +597,23 @@ $.extend($.validator, {
 			this.hideErrors();
 			this.addWrapper( this.toShow ).show();
 		},
-		
+
 		validElements: function() {
 			return this.currentElements.not(this.invalidElements());
 		},
-		
+
 		invalidElements: function() {
 			return $(this.errorList).map(function() {
 				return this.element;
 			});
 		},
-		
+
 		showLabel: function(element, message) {
 			var label = this.errorsFor( element );
 			if ( label.length ) {
 				// refresh error/success class
 				label.removeClass().addClass( this.settings.errorClass );
-			
+
 				// check if we have a generated label, replace the message then
 				label.attr("generated") && label.html(message);
 			} else {
@@ -640,11 +640,11 @@ $.extend($.validator, {
 			}
 			this.toShow = this.toShow.add(label);
 		},
-		
+
 		errorsFor: function(element) {
 			return this.errors().filter("[for='" + this.idOrName(element) + "']");
 		},
-		
+
 		idOrName: function(element) {
 			return this.groups[element.name] || (this.checkable(element) ? element.name : element.id || element.name);
 		},
@@ -652,7 +652,7 @@ $.extend($.validator, {
 		checkable: function( element ) {
 			return /radio|checkbox/i.test(element.type);
 		},
-		
+
 		findByName: function( name ) {
 			// select by name and filter by form for performance over form.find("[name=...]")
 			var form = this.currentForm;
@@ -660,7 +660,7 @@ $.extend($.validator, {
 				return element.form == form && element.name == name && element  || null;
 			});
 		},
-		
+
 		getLength: function(value, element) {
 			switch( element.nodeName.toLowerCase() ) {
 			case 'select':
@@ -671,13 +671,13 @@ $.extend($.validator, {
 			}
 			return value.length;
 		},
-	
+
 		depend: function(param, element) {
 			return this.dependTypes[typeof param]
 				? this.dependTypes[typeof param](param, element)
 				: true;
 		},
-	
+
 		dependTypes: {
 			"boolean": function(param, element) {
 				return param;
@@ -689,18 +689,18 @@ $.extend($.validator, {
 				return param(element);
 			}
 		},
-		
+
 		optional: function(element) {
 			return !$.validator.methods.required.call(this, $.trim(element.value), element) && "dependency-mismatch";
 		},
-		
+
 		startRequest: function(element) {
 			if (!this.pending[element.name]) {
 				this.pendingRequest++;
 				this.pending[element.name] = true;
 			}
 		},
-		
+
 		stopRequest: function(element, valid) {
 			this.pendingRequest--;
 			// sometimes synchronization fails, make sure pendingRequest is never < 0
@@ -713,7 +713,7 @@ $.extend($.validator, {
 				$(this.currentForm).triggerHandler("invalid-form", [this]);
 			}
 		},
-		
+
 		previousValue: function(element) {
 			return $.data(element, "previousValue") || $.data(element, "previousValue", previous = {
 				old: null,
@@ -721,9 +721,9 @@ $.extend($.validator, {
 				message: this.defaultMessage( element, "remote" )
 			});
 		}
-		
+
 	},
-	
+
 	classRuleSettings: {
 		required: {required: true},
 		email: {email: true},
@@ -736,13 +736,13 @@ $.extend($.validator, {
 		digits: {digits: true},
 		creditcard: {creditcard: true}
 	},
-	
+
 	addClassRules: function(className, rules) {
 		className.constructor == String ?
 			this.classRuleSettings[className] = rules :
 			$.extend(this.classRuleSettings, className);
 	},
-	
+
 	classRules: function(element) {
 		var rules = {};
 		var classes = $(element).attr('class');
@@ -753,35 +753,35 @@ $.extend($.validator, {
 		});
 		return rules;
 	},
-	
+
 	attributeRules: function(element) {
 		var rules = {};
 		var $element = $(element);
-		
+
 		for (method in $.validator.methods) {
 			var value = $element.attr(method);
 			if (value) {
 				rules[method] = value;
 			}
 		}
-		
+
 		// maxlength may be returned as -1, 2147483647 (IE) and 524288 (safari) for text inputs
 		if (rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength)) {
 			delete rules.maxlength;
 		}
-		
+
 		return rules;
 	},
-	
+
 	metadataRules: function(element) {
 		if (!$.metadata) return {};
-		
+
 		var meta = $.data(element.form, 'validator').settings.meta;
 		return meta ?
 			$(element).metadata()[meta] :
 			$(element).metadata();
 	},
-	
+
 	staticRules: function(element) {
 		var rules = {};
 		var validator = $.data(element.form, 'validator');
@@ -790,7 +790,7 @@ $.extend($.validator, {
 		}
 		return rules;
 	},
-	
+
 	normalizeRules: function(rules, element) {
 		// handle dependency check
 		$.each(rules, function(prop, val) {
@@ -816,12 +816,12 @@ $.extend($.validator, {
 				}
 			}
 		});
-		
+
 		// evaluate parameters
 		$.each(rules, function(rule, parameter) {
 			rules[rule] = $.isFunction(parameter) ? parameter(element) : parameter;
 		});
-		
+
 		// clean number parameters
 		$.each(['minlength', 'maxlength', 'min', 'max'], function() {
 			if (rules[this]) {
@@ -833,7 +833,7 @@ $.extend($.validator, {
 				rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
 			}
 		});
-		
+
 		if ($.validator.autoCreateRanges) {
 			// auto-create ranges
 			if (rules.min && rules.max) {
@@ -847,15 +847,15 @@ $.extend($.validator, {
 				delete rules.maxlength;
 			}
 		}
-		
+
 		// To support custom messages in metadata ignore rule methods titled "messages"
 		if (rules.messages) {
 			delete rules.messages
 		}
-		
+
 		return rules;
 	},
-	
+
 	// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
 	normalizeRule: function(data) {
 		if( typeof data == "string" ) {
@@ -867,7 +867,7 @@ $.extend($.validator, {
 		}
 		return data;
 	},
-	
+
 	// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
 	addMethod: function(name, method, message) {
 		$.validator.methods[name] = method;
@@ -895,20 +895,20 @@ $.extend($.validator, {
 				return $.trim(value).length > 0;
 			}
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/remote
 		remote: function(value, element, param) {
 			if ( this.optional(element) )
 				return "dependency-mismatch";
-			
+
 			var previous = this.previousValue(element);
-			
+
 			if (!this.settings.messages[element.name] )
 				this.settings.messages[element.name] = {};
 			this.settings.messages[element.name].remote = typeof previous.message == "function" ? previous.message(value) : previous.message;
-			
-			param = typeof param == "string" && {url:param} || param; 
-			
+
+			param = typeof param == "string" && {url:param} || param;
+
 			if ( previous.old !== value ) {
 				previous.old = value;
 				var validator = this;
@@ -949,75 +949,75 @@ $.extend($.validator, {
 		minlength: function(value, element, param) {
 			return this.optional(element) || this.getLength($.trim(value), element) >= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/maxlength
 		maxlength: function(value, element, param) {
 			return this.optional(element) || this.getLength($.trim(value), element) <= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/rangelength
 		rangelength: function(value, element, param) {
 			var length = this.getLength($.trim(value), element);
 			return this.optional(element) || ( length >= param[0] && length <= param[1] );
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/min
 		min: function( value, element, param ) {
 			return this.optional(element) || value >= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/max
 		max: function( value, element, param ) {
 			return this.optional(element) || value <= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/range
 		range: function( value, element, param ) {
 			return this.optional(element) || ( value >= param[0] && value <= param[1] );
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/email
 		email: function(value, element) {
 			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
 			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/url
 		url: function(value, element) {
 			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
 			return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
 		},
-        
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/date
 		date: function(value, element) {
 			return this.optional(element) || !/Invalid|NaN/.test(new Date(value));
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
 		dateISO: function(value, element) {
 			return this.optional(element) || /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/dateDE
 		dateDE: function(value, element) {
 			return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/number
 		number: function(value, element) {
 			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/numberDE
 		numberDE: function(value, element) {
 			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value);
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/digits
 		digits: function(value, element) {
 			return this.optional(element) || /^\d+$/.test(value);
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
 		// based on http://en.wikipedia.org/wiki/Luhn
 		creditcard: function(value, element) {
@@ -1045,20 +1045,20 @@ $.extend($.validator, {
 
 			return (nCheck % 10) == 0;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/accept
 		accept: function(value, element, param) {
 			param = typeof param == "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif";
-			return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i")); 
+			return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
 		equalTo: function(value, element, param) {
 			return value == $(param).val();
 		}
-		
+
 	}
-	
+
 });
 
 // deprecated, use $.validator.format instead
@@ -1068,7 +1068,7 @@ $.format = $.validator.format;
 
 // ajax mode: abort
 // usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
-// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort() 
+// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
 ;(function($) {
 	var ajax = $.ajax;
 	var pendingRequests = {};
@@ -1090,13 +1090,13 @@ $.format = $.validator.format;
 // IE has native support, in other browsers, use event caputuring (neither bubbles)
 
 // provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
-// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target 
+// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
 
 // provides triggerEvent(type: String, target: Element) to trigger delegated events
 ;(function($) {
 	$.each({
 		focus: 'focusin',
-		blur: 'focusout'	
+		blur: 'focusout'
 	}, function( original, fix ){
 		$.event.special[fix] = {
 			setup:function() {
diff --git a/fixture_rails_root/public/javascripts/pebbles/lightbox.js b/fixture_rails_root/public/javascripts/pebbles/lightbox.js
index 6d276c7..7eaaa46 100644
--- a/fixture_rails_root/public/javascripts/pebbles/lightbox.js
+++ b/fixture_rails_root/public/javascripts/pebbles/lightbox.js
@@ -1,5 +1,5 @@
 /*
-	Lightbox JS: Fullsize Image Overlays 
+	Lightbox JS: Fullsize Image Overlays
 	by Lokesh Dhakar - http://www.huddletogether.com
 
 	For more information on this script, visit:
@@ -7,11 +7,11 @@
 
 	Licensed under the Creative Commons Attribution 2.5 License - http://creativecommons.org/licenses/by/2.5/
 	(basically, do anything you want, just leave my name and link)
-	
+
 	Table of Contents
 	-----------------
 	Configuration
-	
+
 	Functions
 	- getPageScroll()
 	- getPageSize()
@@ -22,7 +22,7 @@
 	- hideLightbox()
 	- initLightbox()
 	- addLoadEvent()
-	
+
 	Function Calls
 	- addLoadEvent(initLightbox)
 
@@ -35,8 +35,8 @@
 //
 
 // If you would like to use a custom loading image or close button reference them in the next two lines.
-var loadingImage = '/images/loading.gif';		
-var closeButton = '/images/close.gif';		
+var loadingImage = '/images/loading.gif';
+var closeButton = '/images/close.gif';
 
 
 
@@ -59,7 +59,7 @@ function getPageScroll(){
 		yScroll = document.body.scrollTop;
 	}
 
-	arrayPageScroll = new Array('',yScroll) 
+	arrayPageScroll = new Array('',yScroll)
 	return arrayPageScroll;
 }
 
@@ -72,10 +72,10 @@ function getPageScroll(){
 // Edit for Firefox by pHaez
 //
 function getPageSize(){
-	
+
 	var xScroll, yScroll;
-	
-	if (window.innerHeight && window.scrollMaxY) {	
+
+	if (window.innerHeight && window.scrollMaxY) {
 		xScroll = document.body.scrollWidth;
 		yScroll = window.innerHeight + window.scrollMaxY;
 	} else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
@@ -85,7 +85,7 @@ function getPageSize(){
 		xScroll = document.body.offsetWidth;
 		yScroll = document.body.offsetHeight;
 	}
-	
+
 	var windowWidth, windowHeight;
 	if (self.innerHeight) {	// all except Explorer
 		windowWidth = self.innerWidth;
@@ -96,24 +96,24 @@ function getPageSize(){
 	} else if (document.body) { // other Explorers
 		windowWidth = document.body.clientWidth;
 		windowHeight = document.body.clientHeight;
-	}	
-	
+	}
+
 	// for small pages with total height less then height of the viewport
 	if(yScroll < windowHeight){
 		pageHeight = windowHeight;
-	} else { 
+	} else {
 		pageHeight = yScroll;
 	}
 
 	// for small pages with total width less then width of the viewport
-	if(xScroll < windowWidth){	
+	if(xScroll < windowWidth){
 		pageWidth = windowWidth;
 	} else {
 		pageWidth = xScroll;
 	}
 
 
-	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight) 
+	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight)
 	return arrayPageSize;
 }
 
@@ -145,7 +145,7 @@ function getKey(e){
 		keycode = e.which;
 	}
 	key = String.fromCharCode(keycode).toLowerCase();
-	
+
 	if(key == 'x'){ hideLightbox(); }
 }
 
@@ -154,7 +154,7 @@ function getKey(e){
 // listenKey()
 //
 function listenKey () {	document.onkeypress = getKey; }
-	
+
 
 //
 // showLightbox()
@@ -170,7 +170,7 @@ function showLightbox(objLink)
 	var objLoadingImage = document.getElementById('loadingImage');
 	var objLightboxDetails = document.getElementById('lightboxDetails');
 
-	
+
 	var arrayPageSize = getPageSize();
 	var arrayPageScroll = getPageScroll();
 
@@ -195,13 +195,13 @@ function showLightbox(objLink)
 		// and the image placed outside the viewport
 		var lightboxTop = arrayPageScroll[1] + ((arrayPageSize[3] - 35 - imgPreload.height) / 2);
 		var lightboxLeft = ((arrayPageSize[0] - 20 - imgPreload.width) / 2);
-		
+
 		objLightbox.style.top = (lightboxTop < 0) ? "0px" : lightboxTop + "px";
 		objLightbox.style.left = (lightboxLeft < 0) ? "0px" : lightboxLeft + "px";
 
 
 		objLightboxDetails.style.width = imgPreload.width + 'px';
-		
+
 		if(objLink.getAttribute('title')){
 			objCaption.style.display = 'block';
 			//objCaption.style.width = imgPreload.width + 'px';
@@ -209,12 +209,12 @@ function showLightbox(objLink)
 		} else {
 			objCaption.style.display = 'none';
 		}
-		
+
 		// A small pause between the image loading and displaying is required with IE,
 		// this prevents the previous image displaying for a short burst causing flicker.
 		if (navigator.appVersion.indexOf("MSIE")!=-1){
 			pause(250);
-		} 
+		}
 
 		if (objLoadingImage) {	objLoadingImage.style.display = 'none'; }
 
@@ -224,14 +224,14 @@ function showLightbox(objLink)
                 selects[i].style.visibility = "hidden";
         }
 
-	
+
 		objLightbox.style.display = 'block';
 
 		// After image is loaded, update the overlay height as the new image might have
 		// increased the overall page height.
 		arrayPageSize = getPageSize();
 		objOverlay.style.height = (arrayPageSize[1] + 'px');
-		
+
 		// Check for 'x' keypress
 		listenKey();
 
@@ -239,7 +239,7 @@ function showLightbox(objLink)
 	}
 
 	imgPreload.src = objLink.href;
-	
+
 }
 
 
@@ -281,7 +281,7 @@ function hideLightbox()
 //
 function initLightbox()
 {
-	
+
 	if (!document.getElementsByTagName){ return; }
 	var anchors = document.getElementsByTagName("a");
 
@@ -301,7 +301,7 @@ function initLightbox()
 	//	</div>
 	// <div id="lightbox">
 	//		<a href="#" onclick="hideLightbox(); return false;" title="Click anywhere to close image">
-	//			<img id="closeButton" />		
+	//			<img id="closeButton" />
 	//			<img id="lightboxImage" />
 	//		</a>
 	//		<div id="lightboxDetails">
@@ -309,9 +309,9 @@ function initLightbox()
 	//			<div id="keyboardMsg"></div>
 	//		</div>
 	// </div>
-	
+
 	var objBody = document.getElementsByTagName("body").item(0);
-	
+
 	// create overlay div and hardcode some functional styles (aesthetic styles are in CSS file)
 	var objOverlay = document.createElement("div");
 	objOverlay.setAttribute('id','overlay');
@@ -323,13 +323,13 @@ function initLightbox()
 	objOverlay.style.zIndex = '90';
  	objOverlay.style.width = '100%';
 	objBody.insertBefore(objOverlay, objBody.firstChild);
-	
+
 	var arrayPageSize = getPageSize();
 	var arrayPageScroll = getPageScroll();
 
 	// preload and create loader image
 	var imgPreloader = new Image();
-	
+
 	// if loader image found, create link to hide lightbox and create loadingimage
 	imgPreloader.onload=function(){
 
@@ -337,7 +337,7 @@ function initLightbox()
 		objLoadingImageLink.setAttribute('href','#');
 		objLoadingImageLink.onclick = function () {hideLightbox(); return false;}
 		objOverlay.appendChild(objLoadingImageLink);
-		
+
 		var objLoadingImage = document.createElement("img");
 		objLoadingImage.src = loadingImage;
 		objLoadingImage.setAttribute('id','loadingImage');
@@ -357,9 +357,9 @@ function initLightbox()
 	objLightbox.setAttribute('id','lightbox');
 	objLightbox.style.display = 'none';
 	objLightbox.style.position = 'absolute';
-	objLightbox.style.zIndex = '100';	
+	objLightbox.style.zIndex = '100';
 	objBody.insertBefore(objLightbox, objOverlay.nextSibling);
-	
+
 	// create link
 	var objLink = document.createElement("a");
 	objLink.setAttribute('href','#');
@@ -370,7 +370,7 @@ function initLightbox()
 	// preload and create close button image
 	var imgPreloadCloseButton = new Image();
 
-	// if close button image found, 
+	// if close button image found,
 	imgPreloadCloseButton.onload=function(){
 
 		var objCloseButton = document.createElement("img");
@@ -389,7 +389,7 @@ function initLightbox()
 	var objImage = document.createElement("img");
 	objImage.setAttribute('id','lightboxImage');
 	objLink.appendChild(objImage);
-	
+
 	// create details div, a container for the caption and keyboard message
 	var objLightboxDetails = document.createElement("div");
 	objLightboxDetails.setAttribute('id','lightboxDetails');
@@ -419,7 +419,7 @@ function initLightbox()
 // Function found at Simon Willison's weblog - http://simon.incutio.com/
 //
 function addLoadEvent(func)
-{	
+{
 	var oldonload = window.onload;
 	if (typeof window.onload != 'function'){
     	window.onload = func;
diff --git a/fixture_rails_root/public/javascripts/pebbles/lowpro.js b/fixture_rails_root/public/javascripts/pebbles/lowpro.js
index fc0c992..c14e03d 100644
--- a/fixture_rails_root/public/javascripts/pebbles/lowpro.js
+++ b/fixture_rails_root/public/javascripts/pebbles/lowpro.js
@@ -3,10 +3,10 @@ LowPro.Version = '0.5';
 LowPro.CompatibleWithPrototype = '1.6';
 
 if (Prototype.Version.indexOf(LowPro.CompatibleWithPrototype) != 0 && console && console.warn)
-  console.warn("This version of Low Pro is tested with Prototype " + LowPro.CompatibleWithPrototype + 
+  console.warn("This version of Low Pro is tested with Prototype " + LowPro.CompatibleWithPrototype +
                   " it may not work as expected with this version (" + Prototype.Version + ")");
 
-if (!Element.addMethods) 
+if (!Element.addMethods)
   Element.addMethods = function(o) { Object.extend(Element.Methods, o) };
 
 // Simple utility methods for working with the DOM
@@ -16,14 +16,14 @@ DOM = {};
 DOM.Builder = {
 	tagFunc : function(tag) {
 	  return function() {
-	    var attrs, children; 
-	    if (arguments.length>0) { 
-	      if (arguments[0].nodeName || 
-	        typeof arguments[0] == "string") 
-	        children = arguments; 
-	      else { 
-	        attrs = arguments[0]; 
-	        children = Array.prototype.slice.call(arguments, 1); 
+	    var attrs, children;
+	    if (arguments.length>0) {
+	      if (arguments[0].nodeName ||
+	        typeof arguments[0] == "string")
+	        children = arguments;
+	      else {
+	        attrs = arguments[0];
+	        children = Array.prototype.slice.call(arguments, 1);
 	      };
 	    }
 	    return DOM.Builder.create(tag, attrs, children);
@@ -32,9 +32,9 @@ DOM.Builder = {
 	create : function(tag, attrs, children) {
 		attrs = attrs || {}; children = children || []; tag = tag.toLowerCase();
 		var el = new Element(tag, attrs);
-	  
+
 		for (var i=0; i<children.length; i++) {
-			if (typeof children[i] == 'string') 
+			if (typeof children[i] == 'string')
 			  children[i] = document.createTextNode(children[i]);
 			el.appendChild(children[i]);
 		}
@@ -43,14 +43,14 @@ DOM.Builder = {
 };
 
 // Automatically create node builders as $tagName.
-(function() { 
-	var els = ("p|div|span|strong|em|img|table|tr|td|th|thead|tbody|tfoot|pre|code|" + 
-				     "h1|h2|h3|h4|h5|h6|ul|ol|li|form|input|textarea|legend|fieldset|" + 
+(function() {
+	var els = ("p|div|span|strong|em|img|table|tr|td|th|thead|tbody|tfoot|pre|code|" +
+				     "h1|h2|h3|h4|h5|h6|ul|ol|li|form|input|textarea|legend|fieldset|" +
 				     "select|option|blockquote|cite|br|hr|dd|dl|dt|address|a|button|abbr|acronym|" +
-				     "script|link|style|bdo|ins|del|object|param|col|colgroup|optgroup|caption|" + 
+				     "script|link|style|bdo|ins|del|object|param|col|colgroup|optgroup|caption|" +
 				     "label|dfn|kbd|samp|var").split("|");
   var el, i=0;
-	while (el = els[i++]) 
+	while (el = els[i++])
 	  window['$' + el] = DOM.Builder.tagFunc(el);
 })();
 
@@ -92,28 +92,28 @@ Object.extend(Event, {
 Event.addBehavior = function(rules) {
   var ab = this.addBehavior;
   Object.extend(ab.rules, rules);
-  
+
   if (!ab.responderApplied) {
     Ajax.Responders.register({
-      onComplete : function() { 
-        if (Event.addBehavior.reassignAfterAjax) 
+      onComplete : function() {
+        if (Event.addBehavior.reassignAfterAjax)
           setTimeout(function() { ab.reload() }, 10);
       }
     });
     ab.responderApplied = true;
   }
-  
+
   if (ab.autoTrigger) {
     this.onReady(ab.load.bind(ab, rules));
   }
-  
+
 };
 
 Object.extend(Event.addBehavior, {
   rules : {}, cache : [],
   reassignAfterAjax : false,
   autoTrigger : true,
-  
+
   load : function(rules) {
     for (var selector in rules) {
       var observer = rules[selector];
@@ -128,7 +128,7 @@ Object.extend(Event.addBehavior, {
           } else {
             if (!element.$$assigned || !element.$$assigned.include(observer)) {
               if (observer.attach) observer.attach(element);
-              
+
               else observer.call($(element));
               element.$$assigned = element.$$assigned || [];
               element.$$assigned.push(observer);
@@ -138,26 +138,26 @@ Object.extend(Event.addBehavior, {
       });
     }
   },
-  
+
   unload : function() {
     this.cache.each(function(c) {
       Event.stopObserving.apply(Event, c);
     });
     this.cache = [];
   },
-  
+
   reload: function() {
     var ab = Event.addBehavior;
-    ab.unload(); 
+    ab.unload();
     ab.load(ab.rules);
   },
-  
+
   _wrapObserver: function(observer) {
     return function(event) {
-      if (observer.call(this, event) === false) event.stop(); 
+      if (observer.call(this, event) === false) event.stop();
     }
   }
-  
+
 });
 
 Event.observe(window, 'unload', Event.addBehavior.unload.bind(Event.addBehavior));
@@ -169,15 +169,15 @@ $$$ = Event.addBehavior.bind(Event);
 // and their behavior.  Use Behavior.create() to make a new behavior class then use attach() to
 // glue it to an element.  Each element then gets it's own instance of the behavior and any
 // methods called onxxx are bound to the relevent event.
-// 
+//
 // Usage:
-// 
+//
 // var MyBehavior = Behavior.create({
-//   onmouseover : function() { this.element.addClassName('bong') } 
+//   onmouseover : function() { this.element.addClassName('bong') }
 // });
 //
 // Event.addBehavior({ 'a.rollover' : MyBehavior });
-// 
+//
 // If you need to pass additional values to initialize use:
 //
 // Event.addBehavior({ 'a.rollover' : MyBehavior(10, { thing : 15 }) })
@@ -197,7 +197,7 @@ var Behavior = {
     if (Object.isFunction(properties[0]))
       parent = properties.shift();
 
-      var behavior = function() { 
+      var behavior = function() {
         var behavior = arguments.callee;
         if (!this.initialize) {
           var args = $A(arguments);
@@ -207,7 +207,7 @@ var Behavior = {
             behavior.attach.apply(behavior, initArgs);
           };
         } else {
-          var args = (arguments.length == 2 && arguments[1] instanceof Array) ? 
+          var args = (arguments.length == 2 && arguments[1] instanceof Array) ?
                       arguments[1] : Array.prototype.slice.call(arguments, 1);
 
           this.element = $(arguments[0]);
@@ -283,8 +283,8 @@ Remote.Link = Behavior.create(Remote.Base, {
 Remote.Form = Behavior.create(Remote.Base, {
   onclick : function(e) {
     var sourceElement = e.element();
-    
-    if (['input', 'button'].include(sourceElement.nodeName.toLowerCase()) && 
+
+    if (['input', 'button'].include(sourceElement.nodeName.toLowerCase()) &&
         sourceElement.type == 'submit')
       this._submitButton = sourceElement;
   },
diff --git a/fixture_rails_root/public/javascripts/pebbles/markerGroup.js b/fixture_rails_root/public/javascripts/pebbles/markerGroup.js
index 021c9db..f1e2a9c 100644
--- a/fixture_rails_root/public/javascripts/pebbles/markerGroup.js
+++ b/fixture_rails_root/public/javascripts/pebbles/markerGroup.js
@@ -8,7 +8,7 @@ GMarkerGroup.prototype = new GOverlay();
 
 GMarkerGroup.prototype.initialize = function(map) {
     this.map = map;
-    
+
     if(this.active){
 	for(var i = 0 , len = this.markers.length; i < len; i++) {
 	    this.map.addOverlay(this.markers[i]);
@@ -104,9 +104,9 @@ GMarkerGroup.prototype.centerAndZoomOnMarkers = function() {
 	}
 	if(tmpMarkers.length > 0){
     	    this.map.centerAndZoomOnMarkers(tmpMarkers);
-	} 
+	}
     }
-}	
+}
 
 //Deactivate the Group Overlay (convenience method)
 GMarkerGroup.prototype.deactivate = function(){
diff --git a/fixture_rails_root/public/javascripts/pebbles/scriptaculous.js b/fixture_rails_root/public/javascripts/pebbles/scriptaculous.js
index 6cfe36e..781359b 100644
--- a/fixture_rails_root/public/javascripts/pebbles/scriptaculous.js
+++ b/fixture_rails_root/public/javascripts/pebbles/scriptaculous.js
@@ -1,7 +1,7 @@
 // script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -9,7 +9,7 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
 //
@@ -35,15 +35,15 @@ var Scriptaculous = {
       var r = versionString.split('.');
       return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
     }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
+
+    if((typeof Prototype=='undefined') ||
+       (typeof Element == 'undefined') ||
        (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
+       (convertVersionString(Prototype.Version) <
         convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
        throw("script.aculo.us requires the Prototype JavaScript framework >= " +
         Scriptaculous.REQUIRED_PROTOTYPE);
-    
+
     $A(document.getElementsByTagName("script")).findAll( function(s) {
       return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
     }).each( function(s) {
diff --git a/fixture_rails_root/public/javascripts/pebbles/slider.js b/fixture_rails_root/public/javascripts/pebbles/slider.js
index cc46fe3..e0591d7 100644
--- a/fixture_rails_root/public/javascripts/pebbles/slider.js
+++ b/fixture_rails_root/public/javascripts/pebbles/slider.js
@@ -1,6 +1,6 @@
 // script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
+// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs
 //
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
@@ -16,13 +16,13 @@ if (!Control) var Control = { };
 Control.Slider = Class.create({
   initialize: function(handle, track, options) {
     var slider = this;
-    
+
     if (Object.isArray(handle)) {
       this.handles = handle.collect( function(e) { return $(e) });
     } else {
       this.handles = [$(handle)];
     }
-    
+
     this.track   = $(track);
     this.options = options || { };
 
@@ -30,7 +30,7 @@ Control.Slider = Class.create({
     this.increment = this.options.increment || 1;
     this.step      = parseInt(this.options.step || '1');
     this.range     = this.options.range || $R(0,1);
-    
+
     this.value     = 0; // assure backwards compat
     this.values    = this.handles.map( function() { return 0 });
     this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
@@ -45,13 +45,13 @@ Control.Slider = Class.create({
     // Will be used to align the handle onto the track, if necessary
     this.alignX = parseInt(this.options.alignX || '0');
     this.alignY = parseInt(this.options.alignY || '0');
-    
+
     this.trackLength = this.maximumOffset() - this.minimumOffset();
 
-    this.handleLength = this.isVertical() ? 
-      (this.handles[0].offsetHeight != 0 ? 
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
         this.handles[0].style.width.replace(/px$/,""));
 
     this.active   = false;
@@ -75,20 +75,20 @@ Control.Slider = Class.create({
     this.handles.each( function(h,i) {
       i = slider.handles.length-1-i;
       slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ? 
-          slider.options.sliderValue[i] : slider.options.sliderValue) || 
+        (Object.isArray(slider.options.sliderValue) ?
+          slider.options.sliderValue[i] : slider.options.sliderValue) ||
          slider.range.start), i);
       h.makePositioned().observe("mousedown", slider.eventMouseDown);
     });
-    
+
     this.track.observe("mousedown", this.eventMouseDown);
     document.observe("mouseup", this.eventMouseUp);
     document.observe("mousemove", this.eventMouseMove);
-    
+
     this.initialized = true;
   },
   dispose: function() {
-    var slider = this;    
+    var slider = this;
     Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
     Event.stopObserving(document, "mouseup", this.eventMouseUp);
     Event.stopObserving(document, "mousemove", this.eventMouseMove);
@@ -101,12 +101,12 @@ Control.Slider = Class.create({
   },
   setEnabled: function(){
     this.disabled = false;
-  },  
+  },
   getNearestValue: function(value){
     if (this.allowedValues){
       if (value >= this.allowedValues.max()) return(this.allowedValues.max());
       if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-      
+
       var offset = Math.abs(this.allowedValues[0] - value);
       var newValue = this.allowedValues[0];
       this.allowedValues.each( function(v) {
@@ -114,7 +114,7 @@ Control.Slider = Class.create({
         if (currentOffset <= offset){
           newValue = v;
           offset = currentOffset;
-        } 
+        }
       });
       return newValue;
     }
@@ -138,28 +138,28 @@ Control.Slider = Class.create({
     sliderValue = this.getNearestValue(sliderValue);
     this.values[handleIdx] = sliderValue;
     this.value = this.values[0]; // assure backwards compat
-    
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
+
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
       this.translateToPx(sliderValue);
-    
+
     this.drawSpans();
     if (!this.dragging || !this.event) this.updateFinished();
   },
   setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
       handleIdx || this.activeHandleIdx || 0);
   },
   translateToPx: function(value) {
     return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
       (value - this.range.start)) + "px";
   },
   translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) * 
+    return ((offset/(this.trackLength-this.handleLength) *
       (this.range.end-this.range.start)) + this.range.start);
   },
   getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K); 
+    var v = this.values.sortBy(Prototype.K);
     range = range || 0;
     return $R(v[range],v[range+1]);
   },
@@ -167,12 +167,12 @@ Control.Slider = Class.create({
     return(this.isVertical() ? this.alignY : this.alignX);
   },
   maximumOffset: function(){
-    return(this.isVertical() ? 
+    return(this.isVertical() ?
       (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY : 
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
         this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },  
+  },
   isVertical:  function(){
     return (this.axis == 'vertical');
   },
@@ -184,7 +184,7 @@ Control.Slider = Class.create({
       this.setSpan(this.options.startSpan,
         $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
     if (this.options.endSpan)
-      this.setSpan(this.options.endSpan, 
+      this.setSpan(this.options.endSpan,
         $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
   },
   setSpan: function(span, range) {
@@ -204,14 +204,14 @@ Control.Slider = Class.create({
     if (Event.isLeftClick(event)) {
       if (!this.disabled){
         this.active = true;
-        
+
         var handle = Event.element(event);
         var pointer  = [Event.pointerX(event), Event.pointerY(event)];
         var track = handle;
         if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track); 
+          var offsets  = Position.cumulativeOffset(this.track);
           this.event = event;
-          this.setValue(this.translateToValue( 
+          this.setValue(this.translateToValue(
            (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
           ));
           var offsets  = Position.cumulativeOffset(this.activeHandle);
@@ -219,14 +219,14 @@ Control.Slider = Class.create({
           this.offsetY = (pointer[1] - offsets[1]);
         } else {
           // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
             handle = handle.parentNode;
-            
+
           if (this.handles.indexOf(handle)!=-1) {
             this.activeHandle    = handle;
             this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
             this.updateStyles();
-            
+
             var offsets  = Position.cumulativeOffset(this.activeHandle);
             this.offsetX = (pointer[0] - offsets[0]);
             this.offsetY = (pointer[1] - offsets[1]);
@@ -261,14 +261,14 @@ Control.Slider = Class.create({
     }
     this.active = false;
     this.dragging = false;
-  },  
+  },
   finishDrag: function(event, success) {
     this.active = false;
     this.dragging = false;
     this.updateFinished();
   },
   updateFinished: function() {
-    if (this.initialized && this.options.onChange) 
+    if (this.initialized && this.options.onChange)
       this.options.onChange(this.values.length>1 ? this.values : this.value, this);
     this.event = null;
   }
diff --git a/fixture_rails_root/public/javascripts/pebbles/sound.js b/fixture_rails_root/public/javascripts/pebbles/sound.js
index eba3843..6d193c7 100644
--- a/fixture_rails_root/public/javascripts/pebbles/sound.js
+++ b/fixture_rails_root/public/javascripts/pebbles/sound.js
@@ -23,7 +23,7 @@ Sound = {
     var options = Object.extend({
       track: 'global', url: url, replace: false
     }, arguments[1] || {});
-    
+
     if(options.replace && this.tracks[options.track]) {
       $R(0, this.tracks[options.track].id).each(function(id){
         var sound = $('sound_'+options.track+'_'+id);
@@ -32,14 +32,14 @@ Sound = {
       })
       this.tracks[options.track] = null;
     }
-      
+
     if(!this.tracks[options.track])
       this.tracks[options.track] = { id: 0 }
     else
       this.tracks[options.track].id++;
-      
+
     options.id = this.tracks[options.track].id;
-    $$('body')[0].insert( 
+    $$('body')[0].insert(
       Prototype.Browser.IE ? new Element('bgsound',{
         id: 'sound_'+options.track+'_'+options.id,
         src: options.url, loop: 1, autostart: true
diff --git a/fixture_rails_root/public/javascripts/pebbles/unittest.js b/fixture_rails_root/public/javascripts/pebbles/unittest.js
index 13473a3..91d9776 100644
--- a/fixture_rails_root/public/javascripts/pebbles/unittest.js
+++ b/fixture_rails_root/public/javascripts/pebbles/unittest.js
@@ -19,10 +19,10 @@ Event.simulateMouse = function(element, eventName) {
     metaKey:  false
   }, arguments[2] || {});
   var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView,
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY,
     options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
-  
+
   if(this.mark) Element.remove(this.mark);
   this.mark = document.createElement('div');
   this.mark.appendChild(document.createTextNode(" "));
@@ -34,10 +34,10 @@ Event.simulateMouse = function(element, eventName) {
   this.mark.style.height = "5px;";
   this.mark.style.borderTop = "1px solid red;"
   this.mark.style.borderLeft = "1px solid red;"
-  
+
   if(this.step)
     alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
+
   $(element).dispatchEvent(oEvent);
 };
 
@@ -55,7 +55,7 @@ Event.simulateKey = function(element, eventName) {
   }, arguments[2] || {});
 
   var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
+  oEvent.initKeyEvent(eventName, true, true, window,
     options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
     options.keyCode, options.charCode );
   $(element).dispatchEvent(oEvent);
@@ -123,7 +123,7 @@ Test.Unit.Logger.prototype = {
   _toHTML: function(txt) {
     return txt.escapeHTML().replace(/\n/g,"<br/>");
   },
-  addLinksToResults: function(){ 
+  addLinksToResults: function(){
     $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
       td.title = "Run only this test"
       Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
@@ -162,7 +162,7 @@ Test.Unit.Runner.prototype = {
           if(/^test/.test(testcase)) {
             this.tests.push(
                new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase,
                  testcases[testcase], testcases["setup"], testcases["teardown"]
                ));
           }
@@ -203,7 +203,7 @@ Test.Unit.Runner.prototype = {
   },
   postResults: function() {
     if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
+      new Ajax.Request(this.options.resultsURL,
         { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
     }
   },
@@ -240,9 +240,9 @@ Test.Unit.Runner.prototype = {
       errors     +=   this.tests[i].errors;
     }
     return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
+      (this.options.context ? this.options.context + ': ': '') +
+      this.tests.length + " tests, " +
+      assertions + " assertions, " +
       failures   + " failures, " +
       errors     + " errors");
   }
@@ -258,7 +258,7 @@ Test.Unit.Assertions.prototype = {
   },
   summary: function() {
     return (
-      this.assertions + " assertions, " + 
+      this.assertions + " assertions, " +
       this.failures   + " failures, " +
       this.errors     + " errors" + "\n" +
       this.messages.join("\n"));
@@ -284,55 +284,55 @@ Test.Unit.Assertions.prototype = {
   },
   assert: function(expression) {
     var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
+    try { expression ? this.pass() :
       this.fail(message); }
     catch(e) { this.error(e); }
   },
   assertEqual: function(expected, actual) {
     var message = arguments[2] || "assertEqual";
     try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
   assertInspect: function(expected, actual) {
     var message = arguments[2] || "assertInspect";
     try { (expected == actual.inspect()) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
   assertEnumEqual: function(expected, actual) {
     var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
+    try { $A(expected).length == $A(actual).length &&
       expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) +
           ', actual ' + Test.Unit.inspect(actual)); }
     catch(e) { this.error(e); }
   },
   assertNotEqual: function(expected, actual) {
     var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
+    try { (expected != actual) ? this.pass() :
       this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
+  assertIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertIdentical";
+    try { (expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
   },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
+  assertNotIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertNotIdentical";
+    try { !(expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
   },
   assertNull: function(obj) {
     var message = arguments[1] || 'assertNull'
-    try { (obj==null) ? this.pass() : 
+    try { (obj==null) ? this.pass() :
       this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
     catch(e) { this.error(e); }
   },
@@ -353,38 +353,38 @@ Test.Unit.Assertions.prototype = {
   },
   assertType: function(expected, actual) {
     var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+    try {
+      (actual.constructor == expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + (actual.constructor) + '"'); }
     catch(e) { this.error(e); }
   },
   assertNotOfType: function(expected, actual) {
     var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+    try {
+      (actual.constructor != expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + (actual.constructor) + '"'); }
     catch(e) { this.error(e); }
   },
   assertInstanceOf: function(expected, actual) {
     var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
+    try {
+      (actual instanceof expected) ? this.pass() :
       this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
+    catch(e) { this.error(e); }
   },
   assertNotInstanceOf: function(expected, actual) {
     var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
+    try {
+      !(actual instanceof expected) ? this.pass() :
       this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
+    catch(e) { this.error(e); }
   },
   assertRespondsTo: function(method, obj) {
     var message = arguments[2] || 'assertRespondsTo';
     try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() :
       this.fail(message + ": object doesn't respond to [" + method + "]"); }
     catch(e) { this.error(e); }
   },
@@ -393,7 +393,7 @@ Test.Unit.Assertions.prototype = {
     try {
       var m = obj[method];
       if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
+      m() ? this.pass() :
       this.fail(message + ": method returned false"); }
     catch(e) { this.error(e); }
   },
@@ -402,17 +402,17 @@ Test.Unit.Assertions.prototype = {
     try {
       var m = obj[method];
       if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
+      !m() ? this.pass() :
       this.fail(message + ": method returned true"); }
     catch(e) { this.error(e); }
   },
   assertRaise: function(exceptionName, method) {
     var message = arguments[2] || 'assertRaise';
-    try { 
+    try {
       method();
       this.fail(message + ": exception expected but none was raised"); }
     catch(e) {
-      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e);
     }
   },
   assertElementsMatch: function() {
@@ -434,7 +434,7 @@ Test.Unit.Assertions.prototype = {
     var startAt = new Date();
     (iterations || 1).times(operation);
     var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
+    this.info((arguments[2] || 'Operation') + ' finished ' +
        iterations + ' iterations in ' + (timeTaken/1000)+'s' );
     return timeTaken;
   },
@@ -444,7 +444,7 @@ Test.Unit.Assertions.prototype = {
     this.assertNotNull(element);
     if(element.style && Element.getStyle(element, 'display') == 'none')
       return false;
-    
+
     return this._isVisible(element.parentNode);
   },
   assertNotVisible: function(element) {
@@ -457,7 +457,7 @@ Test.Unit.Assertions.prototype = {
     var startAt = new Date();
     (iterations || 1).times(operation);
     var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
+    this.info((arguments[2] || 'Operation') + ' finished ' +
        iterations + ' iterations in ' + (timeTaken/1000)+'s' );
     return timeTaken;
   }
@@ -468,7 +468,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p
   initialize: function(name, test, setup, teardown) {
     Test.Unit.Assertions.prototype.initialize.bind(this)();
     this.name           = name;
-    
+
     if(typeof test == 'string') {
       test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
       test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
@@ -478,7 +478,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p
     } else {
       this.test = test || function() {};
     }
-    
+
     this.setup          = setup || function() {};
     this.teardown       = teardown || function() {};
     this.isWaiting      = false;
@@ -519,23 +519,23 @@ Test.setupBDDExtensionMethods = function(){
     shouldNotBeAn:   'assertNotOfType',
     shouldBeNull:    'assertNull',
     shouldNotBeNull: 'assertNotNull',
-    
+
     shouldBe:        'assertReturnsTrue',
     shouldNotBe:     'assertReturnsFalse',
     shouldRespondTo: 'assertRespondsTo'
   };
-  var makeAssertion = function(assertion, args, object) { 
+  var makeAssertion = function(assertion, args, object) {
    	this[assertion].apply(this,(args || []).concat([object]));
   }
-  
-  Test.BDDMethods = {};   
-  $H(METHODMAP).each(function(pair) { 
-    Test.BDDMethods[pair.key] = function() { 
-       var args = $A(arguments); 
-       var scope = args.shift(); 
-       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+
+  Test.BDDMethods = {};
+  $H(METHODMAP).each(function(pair) {
+    Test.BDDMethods[pair.key] = function() {
+       var args = $A(arguments);
+       var scope = args.shift();
+       makeAssertion.apply(scope, [pair.value, args, this]); };
   });
-  
+
   [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
     function(p){ Object.extend(p, Test.BDDMethods) }
   );
@@ -543,7 +543,7 @@ Test.setupBDDExtensionMethods = function(){
 
 Test.context = function(name, spec, log){
   Test.setupBDDExtensionMethods();
-  
+
   var compiledSpec = {};
   var titles = {};
   for(specName in spec) {
@@ -557,7 +557,7 @@ Test.context = function(name, spec, log){
         var body = spec[specName].toString().split('\n').slice(1);
         if(/^\{/.test(body[0])) body = body.slice(1);
         body.pop();
-        body = body.map(function(statement){ 
+        body = body.map(function(statement){
           return statement.strip()
         });
         compiledSpec[testName] = body.join('\n');
diff --git a/fixture_rails_root/public/javascripts/pebbles/wms-gs.js b/fixture_rails_root/public/javascripts/pebbles/wms-gs.js
index c67146b..087e694 100644
--- a/fixture_rails_root/public/javascripts/pebbles/wms-gs.js
+++ b/fixture_rails_root/public/javascripts/pebbles/wms-gs.js
@@ -19,8 +19,8 @@ var WGS84_ECCENTRICITY = 0.0818191913108718138;
 var DEG2RAD=0.0174532922519943;
 var PI=3.14159267;
 
-function dd2MercMetersLng(p_lng) { 
-	return WGS84_SEMI_MAJOR_AXIS * (p_lng*DEG2RAD); 
+function dd2MercMetersLng(p_lng) {
+	return WGS84_SEMI_MAJOR_AXIS * (p_lng*DEG2RAD);
 }
 
 function dd2MercMetersLat(p_lat) {
@@ -43,7 +43,7 @@ getTileUrlForWMS=function(a,b,c) {
 	var lLRP = new GPoint((a.x+1)*256,a.y*256);
 	var lUL = G_NORMAL_MAP.getProjection().fromPixelToLatLng(lULP,b,c);
 	var lLR = G_NORMAL_MAP.getProjection().fromPixelToLatLng(lLRP,b,c);
-	 
+
 	if (this.useGeographic){
            var lBbox=lUL.x+","+lUL.y+","+lLR.x+","+lLR.y;
     	   var lSRS="EPSG:4326";
@@ -56,7 +56,7 @@ getTileUrlForWMS=function(a,b,c) {
 	lURL+="&SERVICE=WMS";
 	lURL+="&VERSION=1.1.1";
 	lURL+="&LAYERS="+this.layers;
-	lURL+="&STYLES="+this.styles; 
+	lURL+="&STYLES="+this.styles;
 	lURL+="&FORMAT=image/"+this.format;
 	lURL+="&BGCOLOR=0xFFFFFF";
 	lURL+="&TRANSPARENT=TRUE";
diff --git a/fixture_rails_root/public/javascripts/pebbles/ym4r-gm.js b/fixture_rails_root/public/javascripts/pebbles/ym4r-gm.js
index 0b433b5..adb2bc6 100644
--- a/fixture_rails_root/public/javascripts/pebbles/ym4r-gm.js
+++ b/fixture_rails_root/public/javascripts/pebbles/ym4r-gm.js
@@ -61,9 +61,9 @@ GMap2.prototype.centerAndZoomOnMarkers = function(markers) {
      for (var i=1, len = markers.length ; i<len; i++) {
 	 bounds.extend(markers[i].getPoint());
      }
-     
+
      this.centerAndZoomOnBounds(bounds);
- } 
+ }
 
 GMap2.prototype.centerAndZoomOnPoints = function(points) {
      var bounds = new GLatLngBounds(points[0],
@@ -71,14 +71,14 @@ GMap2.prototype.centerAndZoomOnPoints = function(points) {
      for (var i=1, len = points.length ; i<len; i++) {
 	 bounds.extend(points[i]);
      }
-     
+
      this.centerAndZoomOnBounds(bounds);
- } 
+ }
 
 GMap2.prototype.centerAndZoomOnBounds = function(bounds) {
     var center = bounds.getCenter();
     this.setCenter(center, this.getBoundsZoomLevel(bounds));
-} 
+}
 
 //For full screen mode
 function setWindowDims(elem) {
diff --git a/fixture_rails_root/public/javascripts/views/admin/categories/edit.js b/fixture_rails_root/public/javascripts/views/admin/categories/edit.js
index 25e3bf9..6aa99d7 100644
--- a/fixture_rails_root/public/javascripts/views/admin/categories/edit.js
+++ b/fixture_rails_root/public/javascripts/views/admin/categories/edit.js
@@ -1,11 +1,11 @@
 jQuery(document).ready(function() {
 
-  var category_image_options = { 
-    target: "#image_list" 
+  var category_image_options = {
+    target: "#image_list"
   }
-  jQuery('#category_image_add').submit(function() { 
-    jQuery(this).ajaxSubmit(category_image_options); 
-    return false; 
+  jQuery('#category_image_add').submit(function() {
+    jQuery(this).ajaxSubmit(category_image_options);
+    return false;
   });
 
   jQuery(".destroy-category-image").live("click", function() {
@@ -14,10 +14,10 @@ jQuery(document).ready(function() {
     }
     return false;
   })
-  
-  jQuery('#category_icon_add').submit(function() { 
-    jQuery(this).ajaxSubmit({ target: "#category_icon"}); 
-    return false; 
+
+  jQuery('#category_icon_add').submit(function() {
+    jQuery(this).ajaxSubmit({ target: "#category_icon"});
+    return false;
   });
 
   jQuery(".destroy-category-icon").live("click", function() {
@@ -26,10 +26,10 @@ jQuery(document).ready(function() {
     }
     return false;
   })
-  
-  jQuery('#category_icon_hover_add').submit(function() { 
-    jQuery(this).ajaxSubmit({ target: "#icon_hover"}); 
-    return false; 
+
+  jQuery('#category_icon_hover_add').submit(function() {
+    jQuery(this).ajaxSubmit({ target: "#icon_hover"});
+    return false;
   });
 
   jQuery("#destroy-category-icon-hover").live("click", function() {
diff --git a/fixture_rails_root/public/javascripts/views/admin/categories/index.js b/fixture_rails_root/public/javascripts/views/admin/categories/index.js
index 9be079b..e12154d 100644
--- a/fixture_rails_root/public/javascripts/views/admin/categories/index.js
+++ b/fixture_rails_root/public/javascripts/views/admin/categories/index.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
-  $('#category-list').sortable({ 
-    items: 'li', 
+  $('#category-list').sortable({
+    items: 'li',
     placeholder: 'ui-state-highlight',
     forcePlaceholderSize: 'true',
     update: function(event, ui) {
@@ -9,7 +9,7 @@ $(document).ready(function() {
         {
           _method: 'PUT',
           parent: $(ui.item).parent().attr('id'),
-          right: $(ui.item).next().attr('id') 
+          right: $(ui.item).next().attr('id')
         }
       );
     }
diff --git a/fixture_rails_root/public/javascripts/views/admin/orders/index.js b/fixture_rails_root/public/javascripts/views/admin/orders/index.js
index d86d6c6..03959f5 100644
--- a/fixture_rails_root/public/javascripts/views/admin/orders/index.js
+++ b/fixture_rails_root/public/javascripts/views/admin/orders/index.js
@@ -1,10 +1,10 @@
-(function($) { 
+(function($) {
   $(document).ready(function(){
     $('.delivery_status').change( function() {
       $(this).spin();
       var order_id = $(this).prev('input:hidden').val();
       $.post(
-        '../admin/orders/change_delivery_status', 
+        '../admin/orders/change_delivery_status',
         {
           delivery_status: $(this).val(),
           order_id: order_id
diff --git a/fixture_rails_root/public/javascripts/views/admin/orders/show.js b/fixture_rails_root/public/javascripts/views/admin/orders/show.js
index 6f05c97..0417751 100644
--- a/fixture_rails_root/public/javascripts/views/admin/orders/show.js
+++ b/fixture_rails_root/public/javascripts/views/admin/orders/show.js
@@ -1,9 +1,9 @@
-(function($) { 
+(function($) {
   $(document).ready(function(){
       $('#post_authorize_link').click(function() {
           var order_total = $('#post_authorize_amount').val();
-          $('#order_transactions').load($(this).attr('href'), { _method: 'put', post_authorize_amount: order_total}, 
-                                        $(this).hide()); 
+          $('#order_transactions').load($(this).attr('href'), { _method: 'put', post_authorize_amount: order_total},
+                                        $(this).hide());
           return false;
       });
     $('#print-packing-sheet').click( function() {
diff --git a/fixture_rails_root/public/javascripts/views/carts/show.js b/fixture_rails_root/public/javascripts/views/carts/show.js
index 8b843b7..2c1b420 100644
--- a/fixture_rails_root/public/javascripts/views/carts/show.js
+++ b/fixture_rails_root/public/javascripts/views/carts/show.js
@@ -1,18 +1,18 @@
-(function($) { 
+(function($) {
   $.postJSON = function(url, data, callback) {
     $.post( url, data, callback, "json") ;
-  };  
+  };
 
   $(document).ready(function(){
     $('#regions').change( function() {
       $(this).spin();
       $('#shipping_info').load("/regions/" + $('#regions').val() + "/shipping_methods",
-                               function() { $('.spinner').hide(); }); 
+                               function() { $('.spinner').hide(); });
     });
     $('#methods').livequery('change', function() {
       $(this).spin();
       $.postJSON("/regions/" + $('#regions').val() + "/shipping_methods/" + $(this).val(),
-                 { _method: "PUT"}, 
+                 { _method: "PUT"},
                  function(json){
                    $('#shipping_total').html(json.shipping_total);
                    $('#cart_total').html(json.grand_total);
@@ -26,7 +26,7 @@
       min: 1
     });
     $('#cart_form').validate();
-    
+
   });
 
 })(jQuery);
\ No newline at end of file
diff --git a/fixture_rails_root/public/javascripts/views/orders/new-create.js b/fixture_rails_root/public/javascripts/views/orders/new-create.js
index fd0bc10..a70f446 100644
--- a/fixture_rails_root/public/javascripts/views/orders/new-create.js
+++ b/fixture_rails_root/public/javascripts/views/orders/new-create.js
@@ -5,7 +5,7 @@ function ShowHideShipping() {
     $("#shipping_address_fields").hide();
   }
 }
-(function($) { 
+(function($) {
   $.postJSON = function(url, data, callback) {
     $.post( url, data, callback, "json") ;
   };
@@ -26,7 +26,7 @@ function ShowHideShipping() {
            if (ccMonth < intMonth && ccYear == intYear ) { result = false; }
            return result;
       }, "Card has already expired");
-  
+
   $(document).ready(function(){
     $('#order_form').validate({
       invalidHandler: function() {
@@ -38,13 +38,13 @@ function ShowHideShipping() {
         },
         'shipping_address[city]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },   
+        },
         'shipping_address[state]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },     
+        },
         'shipping_address[state]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },     
+        },
         'shipping_address[postal_code]': {
           zipcode: {depends: function (element) { return $('#address_choice:checked').length == 0 }}
         },
@@ -53,7 +53,7 @@ function ShowHideShipping() {
         }
       }
     });
-    if ($('#order_card_type').length == 0) { 
+    if ($('#order_card_type').length == 0) {
       $('#credit_card_number').rules("remove", "creditcard2");
     }
     $('#promo_code_link').click(function() {
@@ -63,7 +63,7 @@ function ShowHideShipping() {
         function(json) {
           $('#promo_code_message').html(json.promo_code_message).effect("highlight", {}, 3000);
           $('#promo_code_note').html(json.promo_code_note).effect("highlight", {}, 3000);
-          
+
           $('#shipping_total').html(json.shipping_total);
           $('#cart_total').html(json.grand_total);
           if (json.no_discount) {
@@ -87,12 +87,12 @@ function ShowHideShipping() {
           return false;
       });
 
-    
+
     $('#billing_address_state').change(function() {
       var billing_state = $(this).val();
       $.postJSON(
         "../taxes/1",
-        { billing_state: billing_state, _method: "PUT"}, 
+        { billing_state: billing_state, _method: "PUT"},
         function(json){
           if (json.no_tax) {
             $('#tax_row').hide();
@@ -110,7 +110,7 @@ function ShowHideShipping() {
   $('#methods').livequery('change', function() {
       $(this).spin();
       $.postJSON("../regions/1/shipping_methods/" + $(this).val(),
-                 { _method: "PUT"}, 
+                 { _method: "PUT"},
                  function(json){
                    $('#shipping_total').html(json.shipping_total);
                    $('#cart_total').html(json.grand_total);
diff --git a/fixture_rails_root/public/stylesheets/admin.css b/fixture_rails_root/public/stylesheets/admin.css
index 1f65064..2cb3d02 100644
--- a/fixture_rails_root/public/stylesheets/admin.css
+++ b/fixture_rails_root/public/stylesheets/admin.css
@@ -5,8 +5,8 @@ html,body {
 }
 
 body {
-	font-family: "Myriad Pro", "Myriad Web", "Lucida Grande", 
-				 "Trebuchet MS",  Tahoma, Helvetica, Arial, 
+	font-family: "Myriad Pro", "Myriad Web", "Lucida Grande",
+				 "Trebuchet MS",  Tahoma, Helvetica, Arial,
 				sans-serif;
 	font-size: small;
 	position: relative;
@@ -73,7 +73,7 @@ ol, ul {
 
 		#utilty-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#main-navigation li {
@@ -114,7 +114,7 @@ ol, ul {
 	   border-right: 3px #fff solid;
 	   border-bottom: none;
 	}
-		
+
 /* utility navigation */
 
 #utility-navigation {
@@ -133,7 +133,7 @@ ol, ul {
 
 		#utility-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#utility-navigation li {
@@ -141,7 +141,7 @@ ol, ul {
 		margin: 0px;
 		padding: 9px 19px;
 	}
-	
+
 /* auxilary navigation */
 
 #auxilary-navigation {
@@ -158,7 +158,7 @@ ol, ul {
 
 		#auxilary-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#auxilary-navigation li {
@@ -168,8 +168,8 @@ ol, ul {
 	}
 
 /* footer bar */
-#footer-navigation { 
-    color: #666; 
+#footer-navigation {
+    color: #666;
 	background: #eeeee1;
 	clear: both;
 	font-size:  90%;
@@ -179,10 +179,10 @@ ol, ul {
 	padding: 3px;
 }
 
-	#footer-navigation ul { 
+	#footer-navigation ul {
 		margin: 0;
 		padding: 0;
-		text-align: left; 
+		text-align: left;
 		clear:  both;
 	}
 
@@ -195,7 +195,7 @@ ol, ul {
 
 	#footer-navigation a {
 		color: #666;
-		text-decoration: none; 
+		text-decoration: none;
 	}
 
 	#footer-navigation a:hover {
@@ -222,7 +222,7 @@ ol, ul {
 /* banner */
 
 #banner {
-	float: left;	
+	float: left;
 }
 
 /* search */
@@ -279,9 +279,9 @@ ol, ul {
 	border-bottom: solid 1px #C5DBF7;
 	border-left: solid 1px #C5DBF7;
  }
- 
+
 .listing-table td.subcat {
-	margin-left: 20px;	
+	margin-left: 20px;
 }
 
 .listing-table td.actions {
@@ -297,7 +297,7 @@ ol, ul {
  	background-color:#fff;
  	border: solid 0px #ddd;
 }
- 
+
 .listing-table tr td.sorted {
  	background-color: #B9DCFF;
  	border-bottom: solid 1px #AFD0F5;
@@ -369,9 +369,9 @@ ol, ul {
  	background: #333 url(../images/indicator-small.gif) right 50% no-repeat;
 }
 
- 
+
  /* Product Options */
- 
+
 #selection-list {
 	border-style: dotted;
 	border-color: #ccc;
@@ -421,7 +421,7 @@ ol, ul {
 
 
  /* Project Seven Tabs */
- 
+
 .p7TPwrapper {
 	padding: 8px 0px 7px 0px;
 }
@@ -447,7 +447,7 @@ ol, ul {
 	font-size: 1.1em;
 }
 #p7TP1 .p7TP_tabs a, #p7TP2 .p7TP_tabs a,
-#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a, 
+#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a,
 #p7TP5 .p7TP_tabs a {
 	padding: 8px 8px 4px 6px;
 	display: block;
@@ -465,11 +465,11 @@ ol, ul {
 	outline: 1px dotted;
 	outline-color: #ffffff;
 }
-#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover, 
-#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover, 
-#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active, 
+#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover,
+#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover,
+#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active,
 #p7TP2 .p7TP_tabs a:active, #p7TP3 .p7TP_tabs a:active,
-#p7TP4 .p7TP_tabs a:active, 
+#p7TP4 .p7TP_tabs a:active,
 #p7TP5 .p7TP_tabs a:active {
 		background-color: transparent;
 }
@@ -499,7 +499,7 @@ ol, ul {
 	border: 1px solid #CCCCCC;
 
 }
-.p7TPcontent h2, .p7TPcontent h3, 
+.p7TPcontent h2, .p7TPcontent h3,
 .p7TPcontent h4 {
 	font-size: 1.1em;
 	color: #444444;
@@ -509,8 +509,8 @@ ol, ul {
 .p7TPcontent p {
 	margin: 6px 0 12px 0;
 }
-#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down, 
-#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down, 
+#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down,
+#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down,
 #p7TP5 .p7TP_tabs div.down {
 	padding: 0;
 	position: relative;
@@ -518,8 +518,8 @@ ol, ul {
 	background-image: url(p7tp/tabs01_down.gif);
 	background-repeat: no-repeat;
 }
-#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a, 
-#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a, 
+#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a,
+#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a,
 #p7TP5 .p7TP_tabs div.down a {
 	background-image: url(p7tp/tabs01_down2.gif);
 	background-repeat: no-repeat;
@@ -529,4 +529,3 @@ ol, ul {
 .p7TP_tabs {
 	display: none;
 }
- 
\ No newline at end of file
diff --git a/fixture_rails_root/public/stylesheets/lightbox.css b/fixture_rails_root/public/stylesheets/lightbox.css
index 3678502..00104d0 100644
--- a/fixture_rails_root/public/stylesheets/lightbox.css
+++ b/fixture_rails_root/public/stylesheets/lightbox.css
@@ -5,11 +5,11 @@
 	border-bottom: 2px solid #666;
 	border-right: 2px solid #666;
 }
-	
+
 #lightboxDetails {
 	font-size: 0.8em;
 	padding-top: 0.4em;
-}	
+}
 
 #lightboxCaption { float: left; }
 
@@ -17,7 +17,7 @@
 
 #closeButton { top: 5px; right: 5px; }
 
-#lightbox img { border: none; clear: both;} 
+#lightbox img { border: none; clear: both;}
 
 #overlay img { border: none; }
 
diff --git a/fixture_rails_root/public/stylesheets/p7tp.css b/fixture_rails_root/public/stylesheets/p7tp.css
index 164f8c1..b22b8c5 100644
--- a/fixture_rails_root/public/stylesheets/p7tp.css
+++ b/fixture_rails_root/public/stylesheets/p7tp.css
@@ -1,5 +1,5 @@
  /* Project Seven Tabs */
- 
+
 .p7TPwrapper {
 	padding: 8px 0px 7px 0px;
 }
@@ -25,7 +25,7 @@
 	font-size: 1.1em;
 }
 #p7TP1 .p7TP_tabs a, #p7TP2 .p7TP_tabs a,
-#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a, 
+#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a,
 #p7TP5 .p7TP_tabs a {
 	padding: 8px 8px 4px 6px;
 	display: block;
@@ -43,11 +43,11 @@
 	outline: 1px dotted;
 	outline-color: #ffffff;
 }
-#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover, 
-#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover, 
-#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active, 
+#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover,
+#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover,
+#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active,
 #p7TP2 .p7TP_tabs a:active, #p7TP3 .p7TP_tabs a:active,
-#p7TP4 .p7TP_tabs a:active, 
+#p7TP4 .p7TP_tabs a:active,
 #p7TP5 .p7TP_tabs a:active {
 		background-color: transparent;
 }
@@ -77,7 +77,7 @@
 	border: 1px solid #CCCCCC;
 
 }
-.p7TPcontent h2, .p7TPcontent h3, 
+.p7TPcontent h2, .p7TPcontent h3,
 .p7TPcontent h4 {
 	font-size: 1.1em;
 	color: #444444;
@@ -87,8 +87,8 @@
 .p7TPcontent p {
 	margin: 6px 0 12px 0;
 }
-#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down, 
-#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down, 
+#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down,
+#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down,
 #p7TP5 .p7TP_tabs div.down {
 	padding: 0;
 	position: relative;
@@ -96,8 +96,8 @@
 	background-image: url(p7tp/tabs01_down.gif);
 	background-repeat: no-repeat;
 }
-#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a, 
-#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a, 
+#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a,
+#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a,
 #p7TP5 .p7TP_tabs div.down a {
 	background-image: url(p7tp/tabs01_down2.gif);
 	background-repeat: no-repeat;
diff --git a/fixture_rails_root/test/test_helper.rb b/fixture_rails_root/test/test_helper.rb
index b9fe251..e222496 100644
--- a/fixture_rails_root/test/test_helper.rb
+++ b/fixture_rails_root/test/test_helper.rb
@@ -16,7 +16,7 @@ class ActiveSupport::TestCase
   # don't care one way or the other, switching from MyISAM to InnoDB tables
   # is recommended.
   #
-  # The only drawback to using transactional fixtures is when you actually 
+  # The only drawback to using transactional fixtures is when you actually
   # need to test transactions.  Since your test is bracketed by a transaction,
   # any transactions started in your code will be automatically rolled back.
   self.use_transactional_fixtures = true
diff --git a/fixture_rails_root/vendor/plugins/javascript_auto_include/README b/fixture_rails_root/vendor/plugins/javascript_auto_include/README
index 0b77996..93281e5 100644
--- a/fixture_rails_root/vendor/plugins/javascript_auto_include/README
+++ b/fixture_rails_root/vendor/plugins/javascript_auto_include/README
@@ -6,13 +6,13 @@ JavascriptAutoInclude
 Install
  * On rails 2.1 and above run
  script/plugin install git://github.com/kernow/javascript_auto_include.git
- 
+
 == Usage
 
  Add the following to the head of your template file
 
  <%= javascript_auto_include_tags %>
- 
+
  Now each time the template is loaded javascript files in the public/javascripts/views
  folder that correspond to the name of the current controller or view will be auto
  loaded. It's also possible for the same javascript file to be loaded by multiple views
@@ -32,7 +32,7 @@ Install
 		 show.js
 
  Assuming the above file structure loading each of the following urls would include:
- 
+
  mydomain.com/users             # includes users.js
  mydomain.com/users/edit/1      # includes users.js and edit.js
  mydomain.com/users/show/1      # includes users.js
@@ -47,7 +47,7 @@ Install
 
 http://kernowsoul.com/page/javascript_auto_include
 
-== Acknowledgements 
+== Acknowledgements
 
  Thanks to geoffgarside http://github.com/geoffgarside for also creating a version that can
  include the same file in multiple views. Some of the code comments are from his version as
diff --git a/fixture_rails_root/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb b/fixture_rails_root/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
index a9484a6..7b39042 100644
--- a/fixture_rails_root/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
+++ b/fixture_rails_root/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
@@ -3,27 +3,27 @@ module Helpers
     module AssetTagHelper
       # Checks for the existence of view related javaScripts and
       # includes them based on current controller and action name.
-      # 
+      #
       # Supports the following include options
       #   Given: controller_name => "users", action_name => "new"
-      # 
+      #
       # The following files will be checked for
       #   1. public/javascripts/views/users.js
       #   2. public/javascripts/views/users/new.js
       #   3. public/javascripts/views/users/new-*.js
       #   4. public/javascripts/views/users/*-new.js
       #   5. public/javascripts/views/users/*-new-*.js
-      # 
+      #
       # This allows javascript files to be shared between multiple views
       # an unlimited number of views can be stringed together e.g.
       # new-edit-index.js would be included in the new, edit, and index views
-      
+
       @@jsai_path       = "#{RAILS_ROOT}/public/javascripts/views"
       @@jsai_ext        = '.js'
       @@jsai_url        = 'views'
       @@jsai_delimiter  = '-'
       @@jsai_paths      = []
-      
+
       def javascript_auto_include_tags
         @@jsai_paths = []
         return unless File.directory? @@jsai_path
@@ -33,7 +33,7 @@ def javascript_auto_include_tags
         search_dir(controller.controller_path, controller.action_name)
         javascript_include_tag *@@jsai_paths
       end
-      
+
       private
       def search_dir(cont, action)
         dir = File.join(@@jsai_path, cont)
@@ -46,7 +46,7 @@ def search_dir(cont, action)
           end
         end
       end
-      
+
     end
   end
 end
\ No newline at end of file
diff --git a/lib/hijacker.rb b/lib/hijacker.rb
index 7eb02f6..bfa3ec5 100644
--- a/lib/hijacker.rb
+++ b/lib/hijacker.rb
@@ -19,19 +19,19 @@ def initialize(klass)
     @target_klass = klass
     @method_stores = {}
   end
-  
+
   def hijack_class_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(class_self_instance, method_name, eval_string, arg_names, &block )
   end
-  
+
   def hijack_instance_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(@target_klass, method_name, eval_string, arg_names, &block )
   end
-  
-  # restore all 
+
+  # restore all
   def restore
     @method_stores.each_pair{|klass, method_stores|
-      method_stores.reverse_each{ |method_name, method| 
+      method_stores.reverse_each{ |method_name, method|
         klass.send :undef_method, method_name
         klass.send :define_method, method_name, method if method
       }
@@ -41,27 +41,27 @@ def restore
   rescue
     false
   end
-  
-protected  
+
+protected
 
   def class_self_instance
     @target_klass.send :eval, "class << self; self; end;"
   end
-  
+
   def hijack_method(klass, method_name, eval_string = nil, arg_names = [], &block)
     method_name = method_name.to_s
-    # You have got love ruby!  What other language allows you to pillage and plunder a class like this? 
-    
+    # You have got love ruby!  What other language allows you to pillage and plunder a class like this?
+
     (@method_stores[klass]||=[]) << [
-      method_name, 
+      method_name,
       klass.instance_methods.include?(method_name) && klass.instance_method(method_name)
     ]
-    
+
     klass.send :undef_method, method_name
     if Symbol === eval_string
       klass.send :define_method, method_name, klass.instance_methods(eval_string)
     elsif String === eval_string
-      klass.class_eval <<-EOF 
+      klass.class_eval <<-EOF
         def #{method_name}(#{arg_names * ','})
           #{eval_string}
         end
@@ -69,10 +69,10 @@ def #{method_name}(#{arg_names * ','})
     elsif block_given?
       klass.send :define_method, method_name, block
     end
-    
+
     true
   rescue
     false
   end
-  
+
 end
\ No newline at end of file
diff --git a/lib/optimized.rb b/lib/optimized.rb
index f50f29d..db4da93 100644
--- a/lib/optimized.rb
+++ b/lib/optimized.rb
@@ -1,14 +1,14 @@
 # Nimble Method - Guerrilla's Guide to Optimizing Rails Applications
 
-# Rails surrounds every SQL call and ActionView::Base#render with Benchmark#realtime. 
-# Benchmark#realtime allocates unnecessary 45k per call. 
+# Rails surrounds every SQL call and ActionView::Base#render with Benchmark#realtime.
+# Benchmark#realtime allocates unnecessary 45k per call.
 #
 # Impact:
-# When copying 120 tasks in Acunote this costs 120M. Patch improves performance 
-# from 6s to 5s. 
+# When copying 120 tasks in Acunote this costs 120M. Patch improves performance
+# from 6s to 5s.
 #
 # Notes:
-# Helps when you do read, create, update lots of AR records, or execute any other 
+# Helps when you do read, create, update lots of AR records, or execute any other
 # SQL, or call #render(:partial) in a loop.
 module Benchmark
     def realtime
@@ -21,15 +21,15 @@ def realtime
 end
 
 
-# Comparison of BigDecimal's (used by Rails for Numeric data types) to booleans 
-# is slow because it requires unnecessary method_missing call and exception catch. 
+# Comparison of BigDecimal's (used by Rails for Numeric data types) to booleans
+# is slow because it requires unnecessary method_missing call and exception catch.
 #
 # Impact:
-# When rendering 120 tasks in Acunote this costs 4M. Patch improves performance 
-# by 100-120ms. 
+# When rendering 120 tasks in Acunote this costs 4M. Patch improves performance
+# by 100-120ms.
 #
 # Notes:
-# Helps when you have the imprudence to accidentally compare BigDecimal's with 
+# Helps when you have the imprudence to accidentally compare BigDecimal's with
 # true or false.
 class BigDecimal
     alias_method :eq_without_boolean_comparison, :==
diff --git a/lib/pebbles/categories.rb b/lib/pebbles/categories.rb
index 6fe4d01..c3cfa1f 100644
--- a/lib/pebbles/categories.rb
+++ b/lib/pebbles/categories.rb
@@ -1,8 +1,8 @@
 module Pebbles
   module Categories
-    
+
     def self.included(base)
-      base.class_eval do 
+      base.class_eval do
         helper_method :categories
       end
     end
diff --git a/lib/pebbles/shipping.rb b/lib/pebbles/shipping.rb
index 131d971..ba7ea22 100644
--- a/lib/pebbles/shipping.rb
+++ b/lib/pebbles/shipping.rb
@@ -1,8 +1,8 @@
 module Pebbles
   module Shipping
-    
+
     def self.included(base)
-      base.class_eval do 
+      base.class_eval do
         helper_method :active_shipping_region_id
         helper_method :active_shipping_region_id=
         helper_method :active_shipping_method_id
@@ -36,8 +36,8 @@ def active_shipping_method_id
     def active_shipping_method_id=(method_value)
       session[:shipping_method_id] = method_value
     end
-    
-    
+
+
 
   end
 end
diff --git a/lib/tasks/pebbles.rake b/lib/tasks/pebbles.rake
index 1987f85..e9a5b9b 100644
--- a/lib/tasks/pebbles.rake
+++ b/lib/tasks/pebbles.rake
@@ -5,6 +5,6 @@ namespace :pebbles do
     system "rsync -ruv vendor/plugins/pebbles/db/migrate db"
     system "rsync -ruv vendor/plugins/pebbles/public ."
   end
-  
-    
+
+
 end
\ No newline at end of file
diff --git a/lib/tasks/rails.rake b/lib/tasks/rails.rake
index a060766..aceb91c 100644
--- a/lib/tasks/rails.rake
+++ b/lib/tasks/rails.rake
@@ -1,4 +1,4 @@
-desc "Checks your app and gently warns you if you are using deprecated code." 
+desc "Checks your app and gently warns you if you are using deprecated code."
 task :deprecated => :environment do
   deprecated = {
     '@params'    => 'Use params[] instead',
@@ -20,11 +20,11 @@ task :deprecated => :environment do
     puts '--> ' + key
     output = `cd '#{File.expand_path('app', RAILS_ROOT)}' && grep -n --exclude=*.svn* -r '#{key}' *`
     unless output =~ /^$/
-      puts "  !! " + warning + " !!" 
+      puts "  !! " + warning + " !!"
       puts '  ' + '.' * (warning.length + 6)
       puts output
     else
-      puts "  Clean! Cheers for you!" 
+      puts "  Clean! Cheers for you!"
     end
     puts
   end
diff --git a/public/javascripts/pebbles/builder.js b/public/javascripts/pebbles/builder.js
index 8301999..524d3a5 100644
--- a/public/javascripts/pebbles/builder.js
+++ b/public/javascripts/pebbles/builder.js
@@ -26,7 +26,7 @@ var Builder = {
   //       due to a Firefox bug
   node: function(elementName) {
     elementName = elementName.toUpperCase();
-    
+
     // try innerHTML approach
     var parentTag = this.NODEMAP[elementName] || 'div';
     var parentElement = document.createElement(parentTag);
@@ -34,14 +34,14 @@ var Builder = {
       parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
     } catch(e) {}
     var element = parentElement.firstChild || null;
-      
+
     // see if browser added wrapping tags
     if(element && (element.tagName.toUpperCase() != elementName))
       element = element.getElementsByTagName(elementName)[0];
-    
+
     // fallback to createElement approach
     if(!element) element = document.createElement(elementName);
-    
+
     // abort if nothing could be created
     if(!element) return;
 
@@ -62,13 +62,13 @@ var Builder = {
             // workaround firefox 1.0.X bug
             if(!element) {
               element = document.createElement(elementName);
-              for(attr in arguments[1]) 
+              for(attr in arguments[1])
                 element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
             }
             if(element.tagName.toUpperCase() != elementName)
               element = parentElement.getElementsByTagName(elementName)[0];
           }
-        } 
+        }
 
     // text, or array of children
     if(arguments[2])
@@ -117,20 +117,20 @@ var Builder = {
     $(element).update(html.strip());
     return element.down();
   },
-  dump: function(scope) { 
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope 
-  
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
     var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
       "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
       "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
       "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
       "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
       "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-  
-    tags.each( function(tag){ 
-      scope[tag] = function() { 
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));  
-      } 
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      }
     });
   }
 }
diff --git a/public/javascripts/pebbles/clusterer.js b/public/javascripts/pebbles/clusterer.js
index eeb6dd9..05f3645 100644
--- a/public/javascripts/pebbles/clusterer.js
+++ b/public/javascripts/pebbles/clusterer.js
@@ -6,7 +6,7 @@
 // Copyright � 2005,2006 by Jef Poskanzer <jef@mail.acme.com>.
 // All rights reserved.
 //
-// Modified for inclusion into the YM4R library in accordance with the 
+// Modified for inclusion into the YM4R library in accordance with the
 // following license:
 //
 // Redistribution and use in source and binary forms, with or without
@@ -34,21 +34,21 @@
 
 
 // Constructor.
-Clusterer = function(markers,icon,maxVisibleMarkers,gridSize,minMarkersPerCluster,maxLinesPerInfoBox) {	
+Clusterer = function(markers,icon,maxVisibleMarkers,gridSize,minMarkersPerCluster,maxLinesPerInfoBox) {
     this.markers = [];
     if(markers){
 	for(var i =0 ; i< markers.length ; i++){
 	    this.addMarker(markers[i]);
 	}
-    }    
+    }
     this.clusters = [];
     this.timeout = null;
-        
+
     this.maxVisibleMarkers = maxVisibleMarkers || 150;
     this.gridSize = gridSize || 5;
     this.minMarkersPerCluster = minMarkersPerCluster || 5;
     this.maxLinesPerInfoBox = maxLinesPerInfoBox || 10;
-    
+
     this.icon = icon || G_DEFAULT_ICON;
 }
 
@@ -57,7 +57,7 @@ Clusterer.prototype = new GOverlay();
 Clusterer.prototype.initialize = function ( map ){
     this.map = map;
     this.currentZoomLevel = map.getZoom();
-   
+
     GEvent.addListener( map, 'zoomend', Clusterer.makeCaller( Clusterer.display, this ) );
     GEvent.addListener( map, 'moveend', Clusterer.makeCaller( Clusterer.display, this ) );
     GEvent.addListener( map, 'infowindowclose', Clusterer.makeCaller( Clusterer.popDown, this ) );
@@ -165,7 +165,7 @@ Clusterer.display = function ( clusterer ){
     dy *= 0.10;
     bounds = new GLatLngBounds(
       new GLatLng( sw.lat() - dy, sw.lng() - dx ),
-      new GLatLng( ne.lat() + dy, ne.lng() + dx ) 
+      new GLatLng( ne.lat() + dy, ne.lng() + dx )
     );
 
     // Partition the markers into visible and non-visible lists.
@@ -265,7 +265,7 @@ Clusterer.display = function ( clusterer ){
 		}
 	    }
 	}
-	
+
 	// Now make cluster-markers for any clusters that need one.
 	for ( i = 0, len = clusterer.clusters.length; i < len; ++i ){
 	    cluster = clusterer.clusters[i];
@@ -361,13 +361,13 @@ Clusterer.prototype.clearCluster = function ( cluster ){
 	    cluster.markers[i] = null;
 	}
     }
-    
+
     cluster.markers.length = 0;
     cluster.markerCount = 0;
-    
+
     if ( cluster == this.poppedUpCluster )
 	this.map.closeInfoWindow();
-    
+
     if ( cluster.onMap )
     {
 	this.map.removeOverlay( cluster.marker );
diff --git a/public/javascripts/pebbles/controls.js b/public/javascripts/pebbles/controls.js
index 5012cb8..12fbca1 100644
--- a/public/javascripts/pebbles/controls.js
+++ b/public/javascripts/pebbles/controls.js
@@ -7,18 +7,18 @@
 //  Richard Livsey
 //  Rahul Bhargava
 //  Rob Wills
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
-// Autocompleter.Base handles all the autocompletion functionality 
+// Autocompleter.Base handles all the autocompletion functionality
 // that's independent of the data source for autocompletion. This
 // includes drawing the autocompletion menu, observing keyboard
 // and mouse events, and similar.
 //
-// Specific autocompleters need to provide, at the very least, 
+// Specific autocompleters need to provide, at the very least,
 // a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method 
+// the text inside the monitored textbox changes. This method
 // should get the text for which to provide autocompletion by
 // invoking this.getToken(), NOT by directly accessing
 // this.element.value. This is to allow incremental tokenized
@@ -32,8 +32,8 @@
 // will incrementally autocomplete with a comma as the token.
 // Additionally, ',' in the above example can be replaced with
 // a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most 
-// useful when one of the tokens is \n (a newline), as it 
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
 // allows smart autocompletion after linebreaks.
 
 if(typeof Effect == 'undefined')
@@ -43,12 +43,12 @@ var Autocompleter = { }
 Autocompleter.Base = Class.create({
   baseInitialize: function(element, update, options) {
     element          = $(element)
-    this.element     = element; 
-    this.update      = $(update);  
-    this.hasFocus    = false; 
-    this.changed     = false; 
-    this.active      = false; 
-    this.index       = 0;     
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
     this.entryCount  = 0;
     this.oldElementValue = this.element.value;
 
@@ -61,28 +61,28 @@ Autocompleter.Base = Class.create({
     this.options.tokens       = this.options.tokens || [];
     this.options.frequency    = this.options.frequency || 0.4;
     this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow || 
-      function(element, update){ 
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
         if(!update.style.position || update.style.position=='absolute') {
           update.style.position = 'absolute';
           Position.clone(element, update, {
-            setHeight: false, 
+            setHeight: false,
             offsetTop: element.offsetHeight
           });
         }
         Effect.Appear(update,{duration:0.15});
       };
-    this.options.onHide = this.options.onHide || 
+    this.options.onHide = this.options.onHide ||
       function(element, update){ new Effect.Fade(update,{duration:0.15}) };
 
-    if(typeof(this.options.tokens) == 'string') 
+    if(typeof(this.options.tokens) == 'string')
       this.options.tokens = new Array(this.options.tokens);
     // Force carriage returns as token delimiters anyway
     if (!this.options.tokens.include('\n'))
       this.options.tokens.push('\n');
 
     this.observer = null;
-    
+
     this.element.setAttribute('autocomplete','off');
 
     Element.hide(this.update);
@@ -93,10 +93,10 @@ Autocompleter.Base = Class.create({
 
   show: function() {
     if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix && 
+    if(!this.iefix &&
       (Prototype.Browser.IE) &&
       (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update, 
+      new Insertion.After(this.update,
        '<iframe id="' + this.update.id + '_iefix" '+
        'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
        'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
@@ -104,7 +104,7 @@ Autocompleter.Base = Class.create({
     }
     if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
   },
-  
+
   fixIEOverlapping: function() {
     Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
     this.iefix.style.zIndex = 1;
@@ -152,15 +152,15 @@ Autocompleter.Base = Class.create({
          Event.stop(event);
          return;
       }
-     else 
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
          (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
 
     this.changed = true;
     this.hasFocus = true;
 
     if(this.observer) clearTimeout(this.observer);
-      this.observer = 
+      this.observer =
         setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
   },
 
@@ -172,35 +172,35 @@ Autocompleter.Base = Class.create({
 
   onHover: function(event) {
     var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex) 
+    if(this.index != element.autocompleteIndex)
     {
         this.index = element.autocompleteIndex;
         this.render();
     }
     Event.stop(event);
   },
-  
+
   onClick: function(event) {
     var element = Event.findElement(event, 'LI');
     this.index = element.autocompleteIndex;
     this.selectEntry();
     this.hide();
   },
-  
+
   onBlur: function(event) {
     // needed to make click events working
     setTimeout(this.hide.bind(this), 250);
     this.hasFocus = false;
-    this.active = false;     
-  }, 
-  
+    this.active = false;
+  },
+
   render: function() {
     if(this.entryCount > 0) {
       for (var i = 0; i < this.entryCount; i++)
-        this.index==i ? 
-          Element.addClassName(this.getEntry(i),"selected") : 
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
           Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) { 
+      if(this.hasFocus) {
         this.show();
         this.active = true;
       }
@@ -209,27 +209,27 @@ Autocompleter.Base = Class.create({
       this.hide();
     }
   },
-  
+
   markPrevious: function() {
     if(this.index > 0) this.index--
       else this.index = this.entryCount-1;
     this.getEntry(this.index).scrollIntoView(true);
   },
-  
+
   markNext: function() {
     if(this.index < this.entryCount-1) this.index++
       else this.index = 0;
     this.getEntry(this.index).scrollIntoView(false);
   },
-  
+
   getEntry: function(index) {
     return this.update.firstChild.childNodes[index];
   },
-  
+
   getCurrentEntry: function() {
     return this.getEntry(this.index);
   },
-  
+
   selectEntry: function() {
     this.active = false;
     this.updateElement(this.getCurrentEntry());
@@ -246,7 +246,7 @@ Autocompleter.Base = Class.create({
       if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
     } else
       value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-    
+
     var bounds = this.getTokenBounds();
     if (bounds[0] != -1) {
       var newValue = this.element.value.substr(0, bounds[0]);
@@ -259,7 +259,7 @@ Autocompleter.Base = Class.create({
     }
     this.oldElementValue = this.element.value;
     this.element.focus();
-    
+
     if (this.options.afterUpdateElement)
       this.options.afterUpdateElement(this.element, selectedElement);
   },
@@ -271,20 +271,20 @@ Autocompleter.Base = Class.create({
       Element.cleanWhitespace(this.update.down());
 
       if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount = 
+        this.entryCount =
           this.update.down().childNodes.length;
         for (var i = 0; i < this.entryCount; i++) {
           var entry = this.getEntry(i);
           entry.autocompleteIndex = i;
           this.addObservers(entry);
         }
-      } else { 
+      } else {
         this.entryCount = 0;
       }
 
       this.stopIndicator();
       this.index = 0;
-      
+
       if(this.entryCount==1 && this.options.autoSelect) {
         this.selectEntry();
         this.hide();
@@ -300,7 +300,7 @@ Autocompleter.Base = Class.create({
   },
 
   onObserverEvent: function() {
-    this.changed = false;   
+    this.changed = false;
     this.tokenBounds = null;
     if(this.getToken().length>=this.options.minChars) {
       this.getUpdatedChoices();
@@ -353,16 +353,16 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 
   getUpdatedChoices: function() {
     this.startIndicator();
-    
-    var entry = encodeURIComponent(this.options.paramName) + '=' + 
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
       encodeURIComponent(this.getToken());
 
     this.options.parameters = this.options.callback ?
       this.options.callback(this.element, entry) : entry;
 
-    if(this.options.defaultParams) 
+    if(this.options.defaultParams)
       this.options.parameters += '&' + this.options.defaultParams;
-    
+
     new Ajax.Request(this.url, this.options);
   },
 
@@ -384,7 +384,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - choices - How many autocompletion choices to offer
 //
 // - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the 
+//                    text only at the beginning of strings in the
 //                    autocomplete array. Defaults to true, which will
 //                    match text at the beginning of any *word* in the
 //                    strings in the autocomplete array. If you want to
@@ -401,7 +401,7 @@ Ajax.Autocompleter = Class.create(Autocompleter.Base, {
 // - ignoreCase - Whether to ignore case when autocompleting.
 //                 Defaults to true.
 //
-// It's possible to pass in a custom function as the 'selector' 
+// It's possible to pass in a custom function as the 'selector'
 // option, if you prefer to write your own autocompletion logic.
 // In that case, the other options above will not apply unless
 // you support them.
@@ -429,20 +429,20 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
         var entry     = instance.getToken();
         var count     = 0;
 
-        for (var i = 0; i < instance.options.array.length &&  
-          ret.length < instance.options.choices ; i++) { 
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
 
           var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ? 
-            elem.toLowerCase().indexOf(entry.toLowerCase()) : 
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
             elem.indexOf(entry);
 
           while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) { 
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" + 
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
                 elem.substr(entry.length) + "</li>");
               break;
-            } else if (entry.length >= instance.options.partialChars && 
+            } else if (entry.length >= instance.options.partialChars &&
               instance.options.partialSearch && foundPos != -1) {
               if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
                 partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
@@ -452,8 +452,8 @@ Autocompleter.Local = Class.create(Autocompleter.Base, {
               }
             }
 
-            foundPos = instance.options.ignoreCase ? 
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) : 
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
               elem.indexOf(entry, foundPos + 1);
 
           }
@@ -939,7 +939,7 @@ Ajax.InPlaceCollectionEditor.DefaultOptions = {
   loadingCollectionText: 'Loading options...'
 };
 
-// Delayed observer, like Form.Element.Observer, 
+// Delayed observer, like Form.Element.Observer,
 // but waits for delay after last key input
 // Ideal for live-search fields
 
@@ -949,7 +949,7 @@ Form.Element.DelayedObserver = Class.create({
     this.element   = $(element);
     this.callback  = callback;
     this.timer     = null;
-    this.lastValue = $F(this.element); 
+    this.lastValue = $F(this.element);
     Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
   },
   delayedListener: function(event) {
diff --git a/public/javascripts/pebbles/dragdrop.js b/public/javascripts/pebbles/dragdrop.js
index bf5cfea..fc142ec 100644
--- a/public/javascripts/pebbles/dragdrop.js
+++ b/public/javascripts/pebbles/dragdrop.js
@@ -1,6 +1,6 @@
 // Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 //           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
@@ -32,7 +32,7 @@ var Droppables = {
         options._containers.push($(containment));
       }
     }
-    
+
     if(options.accept) options.accept = [options.accept].flatten();
 
     Element.makePositioned(element); // fix IE
@@ -40,34 +40,34 @@ var Droppables = {
 
     this.drops.push(options);
   },
-  
+
   findDeepestChild: function(drops) {
     deepest = drops[0];
-      
+
     for (i = 1; i < drops.length; ++i)
       if (Element.isParent(drops[i].element, deepest.element))
         deepest = drops[i];
-    
+
     return deepest;
   },
 
   isContained: function(element, drop) {
     var containmentNode;
     if(drop.tree) {
-      containmentNode = element.treeNode; 
+      containmentNode = element.treeNode;
     } else {
       containmentNode = element.parentNode;
     }
     return drop._containers.detect(function(c) { return containmentNode == c });
   },
-  
+
   isAffected: function(point, element, drop) {
     return (
       (drop.element!=element) &&
       ((!drop._containers) ||
         this.isContained(element, drop)) &&
       ((!drop.accept) ||
-        (Element.classNames(element).detect( 
+        (Element.classNames(element).detect(
           function(v) { return drop.accept.include(v) } ) )) &&
       Position.within(drop.element, point[0], point[1]) );
   },
@@ -87,12 +87,12 @@ var Droppables = {
   show: function(point, element) {
     if(!this.drops.length) return;
     var drop, affected = [];
-    
+
     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });
-        
+
     if(affected.length>0)
       drop = Droppables.findDeepestChild(affected);
 
@@ -101,7 +101,7 @@ var Droppables = {
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-      
+
       if (drop != this.last_active) Droppables.activate(drop);
     }
   },
@@ -112,8 +112,8 @@ var Droppables = {
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
       if (this.last_active.onDrop) {
-        this.last_active.onDrop(element, this.last_active.element, event); 
-        return true; 
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;
       }
   },
 
@@ -126,20 +126,20 @@ var Droppables = {
 var Draggables = {
   drags: [],
   observers: [],
-  
+
   register: function(draggable) {
     if(this.drags.length == 0) {
       this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
       this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
       this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-      
+
       Event.observe(document, "mouseup", this.eventMouseUp);
       Event.observe(document, "mousemove", this.eventMouseMove);
       Event.observe(document, "keypress", this.eventKeypress);
     }
     this.drags.push(draggable);
   },
-  
+
   unregister: function(draggable) {
     this.drags = this.drags.reject(function(d) { return d==draggable });
     if(this.drags.length == 0) {
@@ -148,24 +148,24 @@ var Draggables = {
       Event.stopObserving(document, "keypress", this.eventKeypress);
     }
   },
-  
+
   activate: function(draggable) {
-    if(draggable.options.delay) { 
-      this._timeout = setTimeout(function() { 
-        Draggables._timeout = null; 
-        window.focus(); 
-        Draggables.activeDraggable = draggable; 
-      }.bind(this), draggable.options.delay); 
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
     } else {
       window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
       this.activeDraggable = draggable;
     }
   },
-  
+
   deactivate: function() {
     this.activeDraggable = null;
   },
-  
+
   updateDrag: function(event) {
     if(!this.activeDraggable) return;
     var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -173,36 +173,36 @@ var Draggables = {
     // the same coordinates, prevent needless redrawing (moz bug?)
     if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
     this._lastPointer = pointer;
-    
+
     this.activeDraggable.updateDrag(event, pointer);
   },
-  
+
   endDrag: function(event) {
-    if(this._timeout) { 
-      clearTimeout(this._timeout); 
-      this._timeout = null; 
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
     }
     if(!this.activeDraggable) return;
     this._lastPointer = null;
     this.activeDraggable.endDrag(event);
     this.activeDraggable = null;
   },
-  
+
   keyPress: function(event) {
     if(this.activeDraggable)
       this.activeDraggable.keyPress(event);
   },
-  
+
   addObserver: function(observer) {
     this.observers.push(observer);
     this._cacheObserverCallbacks();
   },
-  
+
   removeObserver: function(element) {  // element instead of observer fixes mem leaks
     this.observers = this.observers.reject( function(o) { return o.element==element });
     this._cacheObserverCallbacks();
   },
-  
+
   notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
     if(this[eventName+'Count'] > 0)
       this.observers.each( function(o) {
@@ -210,7 +210,7 @@ var Draggables = {
       });
     if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
   },
-  
+
   _cacheObserverCallbacks: function() {
     ['onStart','onEnd','onDrag'].each( function(eventName) {
       Draggables[eventName+'Count'] = Draggables.observers.select(
@@ -234,12 +234,12 @@ var Draggable = Class.create({
       },
       endeffect: function(element) {
         var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
           queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){ 
-            Draggable._dragging[element] = false 
+          afterFinish: function(){
+            Draggable._dragging[element] = false
           }
-        }); 
+        });
       },
       zindex: 1000,
       revert: false,
@@ -250,57 +250,57 @@ var Draggable = Class.create({
       snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
       delay: 0
     };
-    
+
     if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
           Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7}); 
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
         }
       });
-    
+
     var options = Object.extend(defaults, arguments[1] || { });
 
     this.element = $(element);
-    
+
     if(options.handle && Object.isString(options.handle))
       this.handle = this.element.down('.'+options.handle, 0);
-    
+
     if(!this.handle) this.handle = $(options.handle);
     if(!this.handle) this.handle = this.element;
-    
+
     if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
       options.scroll = $(options.scroll);
       this._isScrollChild = Element.childOf(this.element, options.scroll);
     }
 
-    Element.makePositioned(this.element); // fix IE    
+    Element.makePositioned(this.element); // fix IE
 
     this.options  = options;
-    this.dragging = false;   
+    this.dragging = false;
 
     this.eventMouseDown = this.initDrag.bindAsEventListener(this);
     Event.observe(this.handle, "mousedown", this.eventMouseDown);
-    
+
     Draggables.register(this);
   },
-  
+
   destroy: function() {
     Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
     Draggables.unregister(this);
   },
-  
+
   currentDelta: function() {
     return([
       parseInt(Element.getStyle(this.element,'left') || '0'),
       parseInt(Element.getStyle(this.element,'top') || '0')]);
   },
-  
+
   initDrag: function(event) {
     if(!Object.isUndefined(Draggable._dragging[this.element]) &&
       Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
+    if(Event.isLeftClick(event)) {
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
       if((tag_name = src.tagName.toUpperCase()) && (
@@ -309,26 +309,26 @@ var Draggable = Class.create({
         tag_name=='OPTION' ||
         tag_name=='BUTTON' ||
         tag_name=='TEXTAREA')) return;
-        
+
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
       this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-      
+
       Draggables.activate(this);
       Event.stop(event);
     }
   },
-  
+
   startDrag: function(event) {
     this.dragging = true;
     if(!this.delta)
       this.delta = this.currentDelta();
-    
+
     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
       this.element.style.zIndex = this.options.zindex;
     }
-    
+
     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);
       this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
@@ -336,7 +336,7 @@ var Draggable = Class.create({
         Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }
-    
+
     if(this.options.scroll) {
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);
@@ -347,28 +347,28 @@ var Draggable = Class.create({
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }
-    
+
     Draggables.notify('onStart', this, event);
-        
+
     if(this.options.starteffect) this.options.starteffect(this.element);
   },
-  
+
   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);
-    
+
     if(!this.options.quiet){
       Position.prepare();
       Droppables.show(pointer, this.element);
     }
-    
+
     Draggables.notify('onDrag', this, event);
-    
+
     this.draw(pointer);
     if(this.options.change) this.options.change(this);
-    
+
     if(this.options.scroll) {
       this.stopScrolling();
-      
+
       var p;
       if (this.options.scroll == window) {
         with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
@@ -386,16 +386,16 @@ var Draggable = Class.create({
       if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
       this.startScrolling(speed);
     }
-    
+
     // fix AppleWebKit rendering
     if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-    
+
     Event.stop(event);
   },
-  
+
   finishDrag: function(event, success) {
     this.dragging = false;
-    
+
     if(this.options.quiet){
       Position.prepare();
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
@@ -410,17 +410,17 @@ var Draggable = Class.create({
       this._clone = null;
     }
 
-    var dropped = false; 
-    if(success) { 
-      dropped = Droppables.fire(event, this.element); 
-      if (!dropped) dropped = false; 
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;
     }
     if(dropped && this.options.onDropped) this.options.onDropped(this.element);
     Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
     if(revert && Object.isFunction(revert)) revert = revert(this.element);
-    
+
     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
       if (dropped == 0 || revert != 'failure')
@@ -433,45 +433,45 @@ var Draggable = Class.create({
     if(this.options.zindex)
       this.element.style.zIndex = this.originalZ;
 
-    if(this.options.endeffect) 
+    if(this.options.endeffect)
       this.options.endeffect(this.element);
-      
+
     Draggables.deactivate(this);
     Droppables.reset();
   },
-  
+
   keyPress: function(event) {
     if(event.keyCode!=Event.KEY_ESC) return;
     this.finishDrag(event, false);
     Event.stop(event);
   },
-  
+
   endDrag: function(event) {
     if(!this.dragging) return;
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
   },
-  
+
   draw: function(point) {
     var pos = Position.cumulativeOffset(this.element);
     if(this.options.ghosting) {
       var r   = Position.realOffset(this.element);
       pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
     }
-    
+
     var d = this.currentDelta();
     pos[0] -= d[0]; pos[1] -= d[1];
-    
+
     if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
       pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
       pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
     }
-    
-    var p = [0,1].map(function(i){ 
-      return (point[i]-pos[i]-this.offset[i]) 
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])
     }.bind(this));
-    
+
     if(this.options.snap) {
       if(Object.isFunction(this.options.snap)) {
         p = this.options.snap(p[0],p[1],this);
@@ -484,16 +484,16 @@ var Draggable = Class.create({
           return (v/this.options.snap).round()*this.options.snap }.bind(this))
       }
     }}
-    
+
     var style = this.element.style;
     if((!this.options.constraint) || (this.options.constraint=='horizontal'))
       style.left = p[0] + "px";
     if((!this.options.constraint) || (this.options.constraint=='vertical'))
       style.top  = p[1] + "px";
-    
+
     if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
   },
-  
+
   stopScrolling: function() {
     if(this.scrollInterval) {
       clearInterval(this.scrollInterval);
@@ -501,14 +501,14 @@ var Draggable = Class.create({
       Draggables._lastScrollPointer = null;
     }
   },
-  
+
   startScrolling: function(speed) {
     if(!(speed[0] || speed[1])) return;
     this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
     this.lastScrolled = new Date();
     this.scrollInterval = setInterval(this.scroll.bind(this), 10);
   },
-  
+
   scroll: function() {
     var current = new Date();
     var delta = current - this.lastScrolled;
@@ -524,7 +524,7 @@ var Draggable = Class.create({
       this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
       this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
     }
-    
+
     Position.prepare();
     Droppables.show(Draggables._lastPointer, this.element);
     Draggables.notify('onDrag', this);
@@ -538,10 +538,10 @@ var Draggable = Class.create({
         Draggables._lastScrollPointer[1] = 0;
       this.draw(Draggables._lastScrollPointer);
     }
-    
+
     if(this.options.change) this.options.change(this);
   },
-  
+
   _getWindowScroll: function(w) {
     var T, L, W, H;
     with (w.document) {
@@ -577,11 +577,11 @@ var SortableObserver = Class.create({
     this.observer  = observer;
     this.lastValue = Sortable.serialize(this.element);
   },
-  
+
   onStart: function() {
     this.lastValue = Sortable.serialize(this.element);
   },
-  
+
   onEnd: function() {
     Sortable.unmark();
     if(this.lastValue != Sortable.serialize(this.element))
@@ -591,11 +591,11 @@ var SortableObserver = Class.create({
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-  
+
   sortables: { },
-  
+
   _findRootElement: function(element) {
-    while (element.tagName.toUpperCase() != "BODY") {  
+    while (element.tagName.toUpperCase() != "BODY") {
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }
@@ -606,22 +606,22 @@ var Sortable = {
     if(!element) return;
     return Sortable.sortables[element.id];
   },
-  
+
   destroy: function(element){
     var s = Sortable.options(element);
-    
+
     if(s) {
       Draggables.removeObserver(s.element);
       s.droppables.each(function(d){ Droppables.remove(d) });
       s.draggables.invoke('destroy');
-      
+
       delete Sortable.sortables[s.element.id];
     }
   },
 
   create: function(element) {
     element = $(element);
-    var options = Object.extend({ 
+    var options = Object.extend({
       element:     element,
       tag:         'li',       // assumes li children, override with tag: 'tagname'
       dropOnEmpty: false,
@@ -635,17 +635,17 @@ var Sortable = {
       delay:       0,
       hoverclass:  null,
       ghosting:    false,
-      quiet:       false, 
+      quiet:       false,
       scroll:      false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      this.SERIALIZE_RULE,
-      
-      // these take arrays of elements or ids and can be 
+
+      // these take arrays of elements or ids and can be
       // used for better initialization performance
       elements:    false,
       handles:     false,
-      
+
       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
     }, arguments[1] || { });
@@ -682,7 +682,7 @@ var Sortable = {
     if(options.zindex)
       options_for_draggable.zindex = options.zindex;
 
-    // build options for the droppables  
+    // build options for the droppables
     var options_for_droppable = {
       overlap:     options.overlap,
       containment: options.containment,
@@ -690,7 +690,7 @@ var Sortable = {
       hoverclass:  options.hoverclass,
       onHover:     Sortable.onHover
     }
-    
+
     var options_for_tree = {
       onHover:      Sortable.onEmptyHover,
       overlap:      options.overlap,
@@ -699,7 +699,7 @@ var Sortable = {
     }
 
     // fix for gecko engine
-    Element.cleanWhitespace(element); 
+    Element.cleanWhitespace(element);
 
     options.draggables = [];
     options.droppables = [];
@@ -712,14 +712,14 @@ var Sortable = {
 
     (options.elements || this.findElements(element, options) || []).each( function(e,i) {
       var handle = options.handles ? $(options.handles[i]) :
-        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
       if(options.tree) e.treeNode = element;
-      options.droppables.push(e);      
+      options.droppables.push(e);
     });
-    
+
     if(options.tree) {
       (Sortable.findTreeElements(element, options) || []).each( function(e) {
         Droppables.add(e, options_for_tree);
@@ -741,7 +741,7 @@ var Sortable = {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.tag);
   },
-  
+
   findTreeElements: function(element, options) {
     return Element.findChildren(
       element, options.only, options.tree ? true : false, options.treeTag);
@@ -758,7 +758,7 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, dropon);
-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
@@ -769,26 +769,26 @@ var Sortable = {
         var oldParentNode = element.parentNode;
         element.style.visibility = "hidden"; // fix gecko rendering
         dropon.parentNode.insertBefore(element, nextElement);
-        if(dropon.parentNode!=oldParentNode) 
+        if(dropon.parentNode!=oldParentNode)
           Sortable.options(oldParentNode).onChange(element);
         Sortable.options(dropon.parentNode).onChange(element);
       }
     }
   },
-  
+
   onEmptyHover: function(element, dropon, overlap) {
     var oldParentNode = element.parentNode;
     var droponOptions = Sortable.options(dropon);
-        
+
     if(!Element.isParent(dropon, element)) {
       var index;
-      
+
       var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
       var child = null;
-            
+
       if(children) {
         var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-        
+
         for (index = 0; index < children.length; index += 1) {
           if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
             offset -= Element.offsetSize (children[index], droponOptions.overlap);
@@ -801,9 +801,9 @@ var Sortable = {
           }
         }
       }
-      
+
       dropon.insertBefore(element, child);
-      
+
       Sortable.options(oldParentNode).onChange(element);
       droponOptions.onChange(element);
     }
@@ -816,34 +816,34 @@ var Sortable = {
   mark: function(dropon, position) {
     // mark on ghosting only
     var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return; 
+    if(sortable && !sortable.ghosting) return;
 
     if(!Sortable._marker) {
-      Sortable._marker = 
+      Sortable._marker =
         ($('dropmarker') || Element.extend(document.createElement('DIV'))).
           hide().addClassName('dropmarker').setStyle({position:'absolute'});
       document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }    
+    }
     var offsets = Position.cumulativeOffset(dropon);
     Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-    
+
     if(position=='after')
-      if(sortable.overlap == 'horizontal') 
+      if(sortable.overlap == 'horizontal')
         Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
       else
         Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-    
+
     Sortable._marker.show();
   },
-  
+
   _tree: function(element, options, parent) {
     var children = Sortable.findElements(element, options) || [];
-  
+
     for (var i = 0; i < children.length; ++i) {
       var match = children[i].id.match(options.format);
 
       if (!match) continue;
-      
+
       var child = {
         id: encodeURIComponent(match ? match[1] : null),
         element: element,
@@ -852,15 +852,15 @@ var Sortable = {
         position: parent.children.length,
         container: $(children[i]).down(options.treeTag)
       }
-      
+
       /* Get the element containing the children and recurse over it */
       if (child.container)
         this._tree(child.container, options, child)
-      
+
       parent.children.push (child);
     }
 
-    return parent; 
+    return parent;
   },
 
   tree: function(element) {
@@ -873,7 +873,7 @@ var Sortable = {
       name: element.id,
       format: sortableOptions.format
     }, arguments[1] || { });
-    
+
     var root = {
       id: null,
       parent: null,
@@ -881,7 +881,7 @@ var Sortable = {
       container: element,
       position: 0
     }
-    
+
     return Sortable._tree(element, options, root);
   },
 
@@ -897,7 +897,7 @@ var Sortable = {
   sequence: function(element) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[1] || { });
-    
+
     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
     });
@@ -906,14 +906,14 @@ var Sortable = {
   setSequence: function(element, new_sequence) {
     element = $(element);
     var options = Object.extend(this.options(element), arguments[2] || { });
-    
+
     var nodeMap = { };
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
         n.parentNode.removeChild(n);
     });
-   
+
     new_sequence.each(function(ident) {
       var n = nodeMap[ident];
       if (n) {
@@ -922,16 +922,16 @@ var Sortable = {
       }
     });
   },
-  
+
   serialize: function(element) {
     element = $(element);
     var options = Object.extend(Sortable.options(element), arguments[1] || { });
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    
+
     if (options.tree) {
       return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" + 
+        return [name + Sortable._constructIndex(item) + "[id]=" +
                 encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
       }).flatten().join('&');
     } else {
@@ -949,7 +949,7 @@ Element.isParent = function(child, element) {
   return Element.isParent(child.parentNode, element);
 }
 
-Element.findChildren = function(element, only, recursive, tagName) {   
+Element.findChildren = function(element, only, recursive, tagName) {
   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();
diff --git a/public/javascripts/pebbles/effects.js b/public/javascripts/pebbles/effects.js
index b8c0259..efa128f 100644
--- a/public/javascripts/pebbles/effects.js
+++ b/public/javascripts/pebbles/effects.js
@@ -5,46 +5,46 @@
 //  Justin Palmer (http://encytemedia.com/)
 //  Mark Pilgrim (http://diveintomark.org/)
 //  Martin Bialasinki
-// 
+//
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/ 
+// For details, see the script.aculo.us web site: http://script.aculo.us/
 
-// converts rgb() and #xxx to #xxxxxx format,  
-// returns self (or first argument) if not convertable  
-String.prototype.parseColor = function() {  
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
   var color = '#';
-  if (this.slice(0,4) == 'rgb(') {  
-    var cols = this.slice(4,this.length-1).split(',');  
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
-  } else {  
-    if (this.slice(0,1) == '#') {  
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
-      if (this.length==7) color = this.toLowerCase();  
-    }  
-  }  
-  return (color.length==7 ? color : (arguments[0] || this));  
+  if (this.slice(0,4) == 'rgb(') {
+    var cols = this.slice(4,this.length-1).split(',');
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+  } else {
+    if (this.slice(0,1) == '#') {
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+      if (this.length==7) color = this.toLowerCase();
+    }
+  }
+  return (color.length==7 ? color : (arguments[0] || this));
 };
 
 /*--------------------------------------------------------------------------*/
 
-Element.collectTextNodes = function(element) {  
+Element.collectTextNodes = function(element) {
   return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
+    return (node.nodeType==3 ? node.nodeValue :
       (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
   }).flatten().join('');
 };
 
-Element.collectTextNodesIgnoreClass = function(element, className) {  
+Element.collectTextNodesIgnoreClass = function(element, className) {
   return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue : 
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
+    return (node.nodeType==3 ? node.nodeValue :
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
         Element.collectTextNodesIgnoreClass(node, className) : ''));
   }).flatten().join('');
 };
 
 Element.setContentZoom = function(element, percent) {
-  element = $(element);  
-  element.setStyle({fontSize: (percent/100) + 'em'});   
+  element = $(element);
+  element.setStyle({fontSize: (percent/100) + 'em'});
   if (Prototype.Browser.WebKit) window.scrollBy(0,0);
   return element;
 };
@@ -84,16 +84,16 @@ var Effect = {
     wobble: function(pos) {
       return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
     },
-    pulse: function(pos, pulses) { 
-      pulses = pulses || 5; 
+    pulse: function(pos, pulses) {
+      pulses = pulses || 5;
       return (
-        ((pos % (1/pulses)) * pulses).round() == 0 ? 
-              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
+        ((pos % (1/pulses)) * pulses).round() == 0 ?
+              ((pos * pulses * 2) - (pos * pulses * 2).floor()) :
           1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
         );
     },
-    spring: function(pos) { 
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
+    spring: function(pos) {
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
     },
     none: function(pos) {
       return 0;
@@ -114,14 +114,14 @@ var Effect = {
   tagifyText: function(element) {
     var tagifyStyle = 'position:relative';
     if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-    
+
     element = $(element);
     $A(element.childNodes).each( function(child) {
       if (child.nodeType==3) {
         child.nodeValue.toArray().each( function(character) {
           element.insertBefore(
             new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character), 
+              character == ' ' ? String.fromCharCode(160) : character),
               child);
         });
         Element.remove(child);
@@ -130,13 +130,13 @@ var Effect = {
   },
   multiple: function(element, effect) {
     var elements;
-    if (((typeof element == 'object') || 
-        Object.isFunction(element)) && 
+    if (((typeof element == 'object') ||
+        Object.isFunction(element)) &&
        (element.length))
       elements = element;
     else
       elements = $(element).childNodes;
-      
+
     var options = Object.extend({
       speed: 0.1,
       delay: 0.0
@@ -158,7 +158,7 @@ var Effect = {
     var options = Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
     }, arguments[2] || { });
-    Effect[element.visible() ? 
+    Effect[element.visible() ?
       Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
   }
 };
@@ -170,20 +170,20 @@ Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
 Effect.ScopedQueue = Class.create(Enumerable, {
   initialize: function() {
     this.effects  = [];
-    this.interval = null;    
+    this.interval = null;
   },
   _each: function(iterator) {
     this.effects._each(iterator);
   },
   add: function(effect) {
     var timestamp = new Date().getTime();
-    
-    var position = Object.isString(effect.options.queue) ? 
+
+    var position = Object.isString(effect.options.queue) ?
       effect.options.queue : effect.options.queue.position;
-    
+
     switch(position) {
       case 'front':
-        // move unstarted effects after this effect  
+        // move unstarted effects after this effect
         this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
             e.startOn  += effect.finishOn;
             e.finishOn += effect.finishOn;
@@ -197,13 +197,13 @@ Effect.ScopedQueue = Class.create(Enumerable, {
         timestamp = this.effects.pluck('finishOn').max() || timestamp;
         break;
     }
-    
+
     effect.startOn  += timestamp;
     effect.finishOn += timestamp;
 
     if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
       this.effects.push(effect);
-    
+
     if (!this.interval)
       this.interval = setInterval(this.loop.bind(this), 15);
   },
@@ -216,7 +216,7 @@ Effect.ScopedQueue = Class.create(Enumerable, {
   },
   loop: function() {
     var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++) 
+    for(var i=0, len=this.effects.length;i<len;i++)
       this.effects[i] && this.effects[i].loop(timePos);
   }
 });
@@ -225,7 +225,7 @@ Effect.Queues = {
   instances: $H(),
   get: function(queueName) {
     if (!Object.isString(queueName)) return queueName;
-    
+
     return this.instances.get(queueName) ||
       this.instances.set(queueName, new Effect.ScopedQueue());
   }
@@ -250,11 +250,11 @@ Effect.Base = Class.create({
     this.fromToDelta  = this.options.to-this.options.from;
     this.totalTime    = this.finishOn-this.startOn;
     this.totalFrames  = this.options.fps*this.options.duration;
-    
+
     eval('this.render = function(pos){ '+
       'if (this.state=="idle"){this.state="running";'+
       codeForEvent(this.options,'beforeSetup')+
-      (this.setup ? 'this.setup();':'')+ 
+      (this.setup ? 'this.setup();':'')+
       codeForEvent(this.options,'afterSetup')+
       '};if (this.state=="running"){'+
       'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
@@ -263,10 +263,10 @@ Effect.Base = Class.create({
       (this.update ? 'this.update(pos);':'')+
       codeForEvent(this.options,'afterUpdate')+
       '}}');
-    
+
     this.event('beforeStart');
     if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
+      Effect.Queues.get(Object.isString(this.options.queue) ?
         'global' : this.options.queue.scope).add(this);
   },
   loop: function(timePos) {
@@ -275,9 +275,9 @@ Effect.Base = Class.create({
         this.render(1.0);
         this.cancel();
         this.event('beforeFinish');
-        if (this.finish) this.finish(); 
+        if (this.finish) this.finish();
         this.event('afterFinish');
-        return;  
+        return;
       }
       var pos   = (timePos - this.startOn) / this.totalTime,
           frame = (pos * this.totalFrames).round();
@@ -289,7 +289,7 @@ Effect.Base = Class.create({
   },
   cancel: function() {
     if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ? 
+      Effect.Queues.get(Object.isString(this.options.queue) ?
         'global' : this.options.queue.scope).remove(this);
     this.state = 'finished';
   },
@@ -327,10 +327,10 @@ Effect.Parallel = Class.create(Effect.Base, {
 Effect.Tween = Class.create(Effect.Base, {
   initialize: function(object, from, to) {
     object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(), 
+    var args = $A(arguments), method = args.last(),
       options = args.length == 5 ? args[3] : null;
     this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) : 
+      Object.isFunction(object[method]) ? object[method].bind(object) :
       function(value) { object[method] = value };
     this.start(Object.extend({ from: from, to: to }, options || { }));
   },
@@ -394,7 +394,7 @@ Effect.Move = Class.create(Effect.Base, {
 
 // for backwards compatibility
 Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element, 
+  return new Effect.Move(element,
     Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
 };
 
@@ -416,15 +416,15 @@ Effect.Scale = Class.create(Effect.Base, {
   setup: function() {
     this.restoreAfterFinish = this.options.restoreAfterFinish || false;
     this.elementPositioning = this.element.getStyle('position');
-    
+
     this.originalStyle = { };
     ['top','left','width','height','fontSize'].each( function(k) {
       this.originalStyle[k] = this.element.style[k];
     }.bind(this));
-      
+
     this.originalTop  = this.element.offsetTop;
     this.originalLeft = this.element.offsetLeft;
-    
+
     var fontSize = this.element.getStyle('font-size') || '100%';
     ['em','px','%','pt'].each( function(fontSizeType) {
       if (fontSize.indexOf(fontSizeType)>0) {
@@ -432,9 +432,9 @@ Effect.Scale = Class.create(Effect.Base, {
         this.fontSizeType = fontSizeType;
       }
     }.bind(this));
-    
+
     this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-    
+
     this.dims = null;
     if (this.options.scaleMode=='box')
       this.dims = [this.element.offsetHeight, this.element.offsetWidth];
@@ -511,7 +511,7 @@ Effect.ScrollTo = function(element) {
   var options = arguments[1] || { },
     scrollOffsets = document.viewport.getScrollOffsets(),
     elementOffsets = $(element).cumulativeOffset(),
-    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
+    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();
 
   if (options.offset) elementOffsets[1] += options.offset;
 
@@ -531,9 +531,9 @@ Effect.Fade = function(element) {
   var options = Object.extend({
     from: element.getOpacity() || 1.0,
     to:   0.0,
-    afterFinishInternal: function(effect) { 
+    afterFinishInternal: function(effect) {
       if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity}); 
+      effect.element.hide().setStyle({opacity: oldOpacity});
     }
   }, arguments[1] || { });
   return new Effect.Opacity(element,options);
@@ -549,15 +549,15 @@ Effect.Appear = function(element) {
     effect.element.forceRerendering();
   },
   beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show(); 
+    effect.element.setOpacity(effect.options.from).show();
   }}, arguments[1] || { });
   return new Effect.Opacity(element,options);
 };
 
 Effect.Puff = function(element) {
   element = $(element);
-  var oldStyle = { 
-    opacity: element.getInlineOpacity(), 
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
     position: element.getStyle('position'),
     top:  element.style.top,
     left: element.style.left,
@@ -565,10 +565,10 @@ Effect.Puff = function(element) {
     height: element.style.height
   };
   return new Effect.Parallel(
-   [ new Effect.Scale(element, 200, 
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), 
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ], 
-     Object.extend({ duration: 1.0, 
+   [ new Effect.Scale(element, 200,
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+     Object.extend({ duration: 1.0,
       beforeSetupInternal: function(effect) {
         Position.absolutize(effect.effects[0].element)
       },
@@ -582,12 +582,12 @@ Effect.BlindUp = function(element) {
   element = $(element);
   element.makeClipping();
   return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
+    Object.extend({ scaleContent: false,
+      scaleX: false,
       restoreAfterFinish: true,
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping();
-      } 
+      }
     }, arguments[1] || { })
   );
 };
@@ -595,15 +595,15 @@ Effect.BlindUp = function(element) {
 Effect.BlindDown = function(element) {
   element = $(element);
   var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
     scaleX: false,
     scaleFrom: 0,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
     afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
-    },  
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
     afterFinishInternal: function(effect) {
       effect.element.undoClipping();
     }
@@ -618,10 +618,10 @@ Effect.SwitchOff = function(element) {
     from: 0,
     transition: Effect.Transitions.flicker,
     afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, { 
+      new Effect.Scale(effect.element, 1, {
         duration: 0.3, scaleFromCenter: true,
         scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) { 
+        beforeSetup: function(effect) {
           effect.element.makePositioned().makeClipping();
         },
         afterFinishInternal: function(effect) {
@@ -639,16 +639,16 @@ Effect.DropOut = function(element) {
     left: element.getStyle('left'),
     opacity: element.getInlineOpacity() };
   return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }), 
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
       new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
     Object.extend(
       { duration: 0.5,
         beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned(); 
+          effect.effects[0].element.makePositioned();
         },
         afterFinishInternal: function(effect) {
           effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        } 
+        }
       }, arguments[1] || { }));
 };
 
@@ -684,9 +684,9 @@ Effect.SlideDown = function(element) {
   // SlideDown need to have the content of the element wrapped in a container element with fixed height!
   var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({ 
-    scaleContent: false, 
-    scaleX: false, 
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
     scaleFrom: window.opera ? 0 : 1,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
@@ -694,11 +694,11 @@ Effect.SlideDown = function(element) {
       effect.element.makePositioned();
       effect.element.down().makePositioned();
       if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show(); 
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
     },
     afterUpdateInternal: function(effect) {
       effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' }); 
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
     },
     afterFinishInternal: function(effect) {
       effect.element.undoClipping().undoPositioned();
@@ -712,8 +712,8 @@ Effect.SlideUp = function(element) {
   var oldInnerBottom = element.down().getStyle('bottom');
   var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false, 
+   Object.extend({ scaleContent: false,
+    scaleX: false,
     scaleMode: 'box',
     scaleFrom: 100,
     scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
@@ -723,7 +723,7 @@ Effect.SlideUp = function(element) {
       effect.element.down().makePositioned();
       if (window.opera) effect.element.setStyle({top: ''});
       effect.element.makeClipping().show();
-    },  
+    },
     afterUpdateInternal: function(effect) {
       effect.element.down().setStyle({bottom:
         (effect.dims[0] - effect.element.clientHeight) + 'px' });
@@ -736,15 +736,15 @@ Effect.SlideUp = function(element) {
   );
 };
 
-// Bug in opera makes the TD containing this element expand for a instance after finish 
+// Bug in opera makes the TD containing this element expand for a instance after finish
 Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, { 
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
     restoreAfterFinish: true,
     beforeSetup: function(effect) {
-      effect.element.makeClipping(); 
-    },  
+      effect.element.makeClipping();
+    },
     afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping(); 
+      effect.element.hide().undoClipping();
     }
   });
 };
@@ -764,13 +764,13 @@ Effect.Grow = function(element) {
     width: element.style.width,
     opacity: element.getInlineOpacity() };
 
-  var dims = element.getDimensions();    
+  var dims = element.getDimensions();
   var initialMoveX, initialMoveY;
   var moveX, moveY;
-  
+
   switch (options.direction) {
     case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0; 
+      initialMoveX = initialMoveY = moveX = moveY = 0;
       break;
     case 'top-right':
       initialMoveX = dims.width;
@@ -795,11 +795,11 @@ Effect.Grow = function(element) {
       moveY = -dims.height / 2;
       break;
   }
-  
+
   return new Effect.Move(element, {
     x: initialMoveX,
     y: initialMoveY,
-    duration: 0.01, 
+    duration: 0.01,
     beforeSetup: function(effect) {
       effect.element.hide().makeClipping().makePositioned();
     },
@@ -808,14 +808,14 @@ Effect.Grow = function(element) {
         [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
           new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
           new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, 
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
             sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
         ], Object.extend({
              beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show(); 
+               effect.effects[0].element.setStyle({height: '0px'}).show();
              },
              afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle); 
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
              }
            }, options)
       )
@@ -840,7 +840,7 @@ Effect.Shrink = function(element) {
 
   var dims = element.getDimensions();
   var moveX, moveY;
-  
+
   switch (options.direction) {
     case 'top-left':
       moveX = moveY = 0;
@@ -857,19 +857,19 @@ Effect.Shrink = function(element) {
       moveX = dims.width;
       moveY = dims.height;
       break;
-    case 'center':  
+    case 'center':
       moveX = dims.width / 2;
       moveY = dims.height / 2;
       break;
   }
-  
+
   return new Effect.Parallel(
     [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
       new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
       new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({            
+    ], Object.extend({
          beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping(); 
+           effect.effects[0].element.makePositioned().makeClipping();
          },
          afterFinishInternal: function(effect) {
            effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
@@ -884,7 +884,7 @@ Effect.Pulsate = function(element) {
   var transition = options.transition || Effect.Transitions.sinoidal;
   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
   reverser.bind(transition);
-  return new Effect.Opacity(element, 
+  return new Effect.Opacity(element,
     Object.extend(Object.extend({  duration: 2.0, from: 0,
       afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
     }, options), {transition: reverser}));
@@ -898,12 +898,12 @@ Effect.Fold = function(element) {
     width: element.style.width,
     height: element.style.height };
   element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({   
+  return new Effect.Scale(element, 5, Object.extend({
     scaleContent: false,
     scaleX: false,
     afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, { 
-      scaleContent: false, 
+    new Effect.Scale(element, 1, {
+      scaleContent: false,
       scaleY: false,
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping().setStyle(oldStyle);
@@ -918,7 +918,7 @@ Effect.Morph = Class.create(Effect.Base, {
     var options = Object.extend({
       style: { }
     }, arguments[1] || { });
-    
+
     if (!Object.isString(options.style)) this.style = $H(options.style);
     else {
       if (options.style.include(':'))
@@ -941,13 +941,13 @@ Effect.Morph = Class.create(Effect.Base, {
     }
     this.start(options);
   },
-  
+
   setup: function(){
     function parseColor(color){
       if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
       color = color.parseColor();
       return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
+        return parseInt( color.slice(i*2+1,i*2+3), 16 )
       });
     }
     this.transforms = this.style.map(function(pair){
@@ -967,9 +967,9 @@ Effect.Morph = Class.create(Effect.Base, {
       }
 
       var originalValue = this.element.getStyle(property);
-      return { 
-        style: property.camelize(), 
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
+      return {
+        style: property.camelize(),
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
         targetValue: unit=='color' ? parseColor(value) : value,
         unit: unit
       };
@@ -986,7 +986,7 @@ Effect.Morph = Class.create(Effect.Base, {
   update: function(position) {
     var style = { }, transform, i = this.transforms.length;
     while(i--)
-      style[(transform = this.transforms[i]).style] = 
+      style[(transform = this.transforms[i]).style] =
         transform.unit=='color' ? '#'+
           (Math.round(transform.originalValue[0]+
             (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
@@ -995,7 +995,7 @@ Effect.Morph = Class.create(Effect.Base, {
           (Math.round(transform.originalValue[2]+
             (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
         (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
             (transform.unit === null ? '' : transform.unit);
     this.element.setStyle(style, true);
   }
@@ -1032,7 +1032,7 @@ Effect.Transform = Class.create({
 });
 
 Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
   'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
   'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
   'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
@@ -1041,7 +1041,7 @@ Element.CSS_PROPERTIES = $w(
   'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
   'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
   'right textIndent top width wordSpacing zIndex');
-  
+
 Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
 
 String.__parseStyleElement = document.createElement('div');
@@ -1053,11 +1053,11 @@ String.prototype.parseStyle = function(){
     String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
     style = String.__parseStyleElement.childNodes[0].style;
   }
-  
+
   Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]); 
+    if (style[property]) styleRules.set(property, style[property]);
   });
-  
+
   if (Prototype.Browser.IE && this.include('opacity'))
     styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
 
@@ -1106,7 +1106,7 @@ Effect.Methods = {
 
 $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
   'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) { 
+  function(effect) {
     Effect.Methods[effect] = function(element, options){
       element = $(element);
       Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
@@ -1115,7 +1115,7 @@ $w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
   }
 );
 
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
   function(f) { Effect.Methods[f] = Element[f]; }
 );
 
diff --git a/public/javascripts/pebbles/geoRssOverlay.js b/public/javascripts/pebbles/geoRssOverlay.js
index 315c26d..99cdb1d 100644
--- a/public/javascripts/pebbles/geoRssOverlay.js
+++ b/public/javascripts/pebbles/geoRssOverlay.js
@@ -78,8 +78,8 @@ GeoRssOverlay.prototype.copy = function(){
 }
 
 GeoRssOverlay.prototype.load=function() {
-    if (this.request != false) { 
-	return; 
+    if (this.request != false) {
+	return;
     }
     this.request = GXmlHttp.create();
     if (this.proxyurl != undefined) {
@@ -121,7 +121,7 @@ GeoRssOverlay.prototype.callback = function() {
 }
 
 GeoRssOverlay.prototype.createMarker = function(item,index) {
-    
+
     var title = item.getElementsByTagName("title")[0].childNodes[0].nodeValue;
     if(item.getElementsByTagName("description").length != 0){
 	//Rss
@@ -138,14 +138,14 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    var lat = item.getElementsByTagNameNS("http://www.w3.org/2003/01/geo/wgs84_pos#","lat")[0].childNodes[0].nodeValue;
 	    var lng = item.getElementsByTagNameNS("http://www.w3.org/2003/01/geo/wgs84_pos#","long")[0].childNodes[0].nodeValue;
 	}else if(item.getElementsByTagNameNS("http://www.georss.org/georss","point").length != 0){
-	    
+
 	    //Simple
 	    var latlng = item.getElementsByTagNameNS("http://www.georss.org/georss","point")[0].childNodes[0].nodeValue.split(" ");
 	    var lat = latlng[0];
 	    var lng = latlng[1];
 	}
     } else {
-	
+
 	if(item.getElementsByTagName("geo:lat").length != 0){
 	    //W3C Geo Vocabulary
 	    var lat = item.getElementsByTagName("geo:lat")[0].childNodes[0].nodeValue;
@@ -157,11 +157,11 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    var lng = latlng[1];
 	}
     }
-    
+
     var point = new GLatLng(parseFloat(lat), parseFloat(lng));
     var marker = new GMarker(point,{'title': title});
     var html = "<a href=\"" + link + "\">" + title + "</a><p/>" + description;
-    
+
     if(this.contentDiv == undefined){
 	GEvent.addListener(marker, "click", function() {
 	    marker.openInfoWindowHtml(html);
@@ -172,9 +172,9 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	    document.getElementById(contentDiv).innerHTML = html;
 	});
     }
-    
+
     if(this.listDiv != undefined){
-	var a = document.createElement('a'); 
+	var a = document.createElement('a');
 	a.innerHTML = title;
 	a.setAttribute("href","#");
 	var georss = this;
@@ -189,6 +189,6 @@ GeoRssOverlay.prototype.createMarker = function(item,index) {
 	div.appendChild(a);
 	document.getElementById(this.listDiv).appendChild(div);
     }
-    
+
     return marker;
 }
diff --git a/public/javascripts/pebbles/jquery/creditcard2.js b/public/javascripts/pebbles/jquery/creditcard2.js
index 3f92058..2e6e63f 100644
--- a/public/javascripts/pebbles/jquery/creditcard2.js
+++ b/public/javascripts/pebbles/jquery/creditcard2.js
@@ -17,10 +17,10 @@
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
 */
- 
+
 jQuery.validator.addMethod("creditcard2", function(value, element, param) {
-	var cardName = param;	
-	
+	var cardName = param;
+
 	var cards = new Array();
 	cards [0] = {cardName: "Visa", lengths: "13,16", prefixes: "4", checkdigit: true};
 	cards [1] = {cardName: "master", lengths: "16", prefixes: "51,52,53,54,55", checkdigit: true};
@@ -34,23 +34,23 @@ jQuery.validator.addMethod("creditcard2", function(value, element, param) {
 	cards [9] = {cardName: "Switch", lengths: "16,18,19", prefixes: "4903,4905,4911,4936,564182,633110,6333,6759", checkdigit: true};
 	cards [10] = {cardName: "Maestro", lengths: "16,18", prefixes: "5020,6", checkdigit: true};
 	cards [11] = {cardName: "VisaElectron", lengths: "16", prefixes: "417500,4917,4913", checkdigit: true};
-  			   
+
 	var cardType = -1;
 	for (var i=0; i<cards.length; i++) {
 		if (cardName.toLowerCase() == cards[i].cardName.toLowerCase()) {
 			cardType = i;
 			break;
 		}
-	}	
+	}
 	if (cardType == -1) { return false; } // card type not found
-  
+
 	value = value.replace (/[\s-]/g, ""); // remove spaces and dashes
 	if (value.length == 0) { return false; } // no length
 
 	var cardNo = value;
 	var cardexp = /^[0-9]{13,19}$/;
 	if (!cardexp.exec(cardNo)) { return false; } // has chars or wrong length
-	
+
 	cardNo = cardNo.replace(/\D/g, ""); // strip down to digits
 
 	if (cards[cardType].checkdigit){
@@ -67,13 +67,13 @@ jQuery.validator.addMethod("creditcard2", function(value, element, param) {
 			}
 			checksum = checksum + calc;
 			if (j ==1) {j = 2} else {j = 1};
-		} 
+		}
 
 		if (checksum % 10 != 0) { return false; } // not mod10
-	}  
+	}
 
 	var lengthValid = false;
-	var prefixValid = false; 
+	var prefixValid = false;
 	var prefix = new Array ();
 	var lengths = new Array ();
 
diff --git a/public/javascripts/pebbles/jquery/livequery.js b/public/javascripts/pebbles/jquery/livequery.js
index dde8ad8..ea5899c 100755
--- a/public/javascripts/pebbles/jquery/livequery.js
+++ b/public/javascripts/pebbles/jquery/livequery.js
@@ -1,5 +1,5 @@
 /*! Copyright (c) 2008 Brandon Aaron (http://brandonaaron.net)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) 
+ * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
  * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
  *
  * Version: 1.0.3
@@ -8,15 +8,15 @@
  */
 
 (function($) {
-	
+
 $.extend($.fn, {
 	livequery: function(type, fn, fn2) {
 		var self = this, q;
-		
+
 		// Handle different call patterns
 		if ($.isFunction(type))
 			fn2 = fn, fn = type, type = undefined;
-			
+
 		// See if Live Query already exists
 		$.each( $.livequery.queries, function(i, query) {
 			if ( self.selector == query.selector && self.context == query.context &&
@@ -24,34 +24,34 @@ $.extend($.fn, {
 					// Found the query, exit the each loop
 					return (q = query) && false;
 		});
-		
+
 		// Create new Live Query if it wasn't found
 		q = q || new $.livequery(this.selector, this.context, type, fn, fn2);
-		
+
 		// Make sure it is running
 		q.stopped = false;
-		
+
 		// Run it immediately for the first time
 		q.run();
-		
+
 		// Contnue the chain
 		return this;
 	},
-	
+
 	expire: function(type, fn, fn2) {
 		var self = this;
-		
+
 		// Handle different call patterns
 		if ($.isFunction(type))
 			fn2 = fn, fn = type, type = undefined;
-			
+
 		// Find the Live Query based on arguments and stop it
 		$.each( $.livequery.queries, function(i, query) {
-			if ( self.selector == query.selector && self.context == query.context && 
+			if ( self.selector == query.selector && self.context == query.context &&
 				(!type || type == query.type) && (!fn || fn.$lqguid == query.fn.$lqguid) && (!fn2 || fn2.$lqguid == query.fn2.$lqguid) && !this.stopped )
 					$.livequery.stop(query.id);
 		});
-		
+
 		// Continue the chain
 		return this;
 	}
@@ -65,14 +65,14 @@ $.livequery = function(selector, context, type, fn, fn2) {
 	this.fn2      = fn2;
 	this.elements = [];
 	this.stopped  = false;
-	
+
 	// The id is the index of the Live Query in $.livequery.queries
 	this.id = $.livequery.queries.push(this)-1;
-	
+
 	// Mark the functions for matching later on
 	fn.$lqguid = fn.$lqguid || $.livequery.guid++;
 	if (fn2) fn2.$lqguid = fn2.$lqguid || $.livequery.guid++;
-	
+
 	// Return the Live Query
 	return this;
 };
@@ -80,7 +80,7 @@ $.livequery = function(selector, context, type, fn, fn2) {
 $.livequery.prototype = {
 	stop: function() {
 		var query = this;
-		
+
 		if ( this.type )
 			// Unbind all bound events
 			this.elements.unbind(this.type, this.fn);
@@ -89,30 +89,30 @@ $.livequery.prototype = {
 			this.elements.each(function(i, el) {
 				query.fn2.apply(el);
 			});
-			
+
 		// Clear out matched elements
 		this.elements = [];
-		
+
 		// Stop the Live Query from running until restarted
 		this.stopped = true;
 	},
-	
+
 	run: function() {
 		// Short-circuit if stopped
 		if ( this.stopped ) return;
 		var query = this;
-		
+
 		var oEls = this.elements,
 			els  = $(this.selector, this.context),
 			nEls = els.not(oEls);
-		
+
 		// Set elements to the latest set of matched elements
 		this.elements = els;
-		
+
 		if (this.type) {
 			// Bind events to newly matched elements
 			nEls.bind(this.type, this.fn);
-			
+
 			// Unbind events to elements no longer matched
 			if (oEls.length > 0)
 				$.each(oEls, function(i, el) {
@@ -125,7 +125,7 @@ $.livequery.prototype = {
 			nEls.each(function() {
 				query.fn.apply(this);
 			});
-			
+
 			// Call the second function for elements no longer matched
 			if ( this.fn2 && oEls.length > 0 )
 				$.each(oEls, function(i, el) {
@@ -142,7 +142,7 @@ $.extend($.livequery, {
 	queue: [],
 	running: false,
 	timeout: null,
-	
+
 	checkQueue: function() {
 		if ( $.livequery.running && $.livequery.queue.length ) {
 			var length = $.livequery.queue.length;
@@ -151,41 +151,41 @@ $.extend($.livequery, {
 				$.livequery.queries[ $.livequery.queue.shift() ].run();
 		}
 	},
-	
+
 	pause: function() {
 		// Don't run anymore Live Queries until restarted
 		$.livequery.running = false;
 	},
-	
+
 	play: function() {
 		// Restart Live Queries
 		$.livequery.running = true;
 		// Request a run of the Live Queries
 		$.livequery.run();
 	},
-	
+
 	registerPlugin: function() {
 		$.each( arguments, function(i,n) {
 			// Short-circuit if the method doesn't exist
 			if (!$.fn[n]) return;
-			
+
 			// Save a reference to the original method
 			var old = $.fn[n];
-			
+
 			// Create a new method
 			$.fn[n] = function() {
 				// Call the original method
 				var r = old.apply(this, arguments);
-				
+
 				// Request a run of the Live Queries
 				$.livequery.run();
-				
+
 				// Return the original methods result
 				return r;
 			}
 		});
 	},
-	
+
 	run: function(id) {
 		if (id != undefined) {
 			// Put the particular Live Query in the queue if it doesn't already exist
@@ -198,13 +198,13 @@ $.extend($.livequery, {
 				if ( $.inArray(id, $.livequery.queue) < 0 )
 					$.livequery.queue.push( id );
 			});
-		
+
 		// Clear timeout if it already exists
 		if ($.livequery.timeout) clearTimeout($.livequery.timeout);
 		// Create a timeout to check the queue and actually run the Live Queries
 		$.livequery.timeout = setTimeout($.livequery.checkQueue, 20);
 	},
-	
+
 	stop: function(id) {
 		if (id != undefined)
 			// Stop are particular Live Query
@@ -231,20 +231,20 @@ var init = $.prototype.init;
 $.prototype.init = function(a,c) {
 	// Call the original init and save the result
 	var r = init.apply(this, arguments);
-	
+
 	// Copy over properties if they exist already
 	if (a && a.selector)
 		r.context = a.context, r.selector = a.selector;
-		
+
 	// Set properties
 	if ( typeof a == 'string' )
 		r.context = c || document, r.selector = a;
-	
+
 	// Return the result
 	return r;
 };
 
 // Give the init function the jQuery prototype for later instantiation (needed after Rev 4091)
 $.prototype.init.prototype = $.prototype;
-	
+
 })(jQuery);
\ No newline at end of file
diff --git a/public/javascripts/pebbles/jquery/spinner.js b/public/javascripts/pebbles/jquery/spinner.js
index bde9f44..9520881 100644
--- a/public/javascripts/pebbles/jquery/spinner.js
+++ b/public/javascripts/pebbles/jquery/spinner.js
@@ -2,7 +2,7 @@ jQuery(document).ready(function(){
   jQuery("body").spin().unspin(); // Weird "image not showing" bug. :-( Need a better solution
 })
 if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
- 
+
 (function($){
   $.extend({
     Spinner: {
@@ -29,7 +29,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
                     }
       }
     });
-    
+
   $.fn.spin = function(){
     var defaults = {
       className: $.Spinner.className,
@@ -37,9 +37,9 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
       spinnerID: $.Spinner.spinnerID
       }
     var settings = $.extend(defaults, arguments.length != 0 ? arguments[0] : {});
- 
+
     (settings.unspinOthers && $.Spinner.unspin());
-    
+
     return this.each(function(){
       var spun = $(this);
       if((spinner = $("#"+spun.attr("spinner"))) && spinner.get(0)){
@@ -47,7 +47,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
         $.Spinner.logger("Already spinning.");
         return jQuery;
       }
-        
+
       var spinnerID = $.Spinner.spinnerID + String(Math.random()).substring(2);
       $("body")
         .append(
@@ -63,7 +63,7 @@ if (typeof jQuery == 'undefined') throw("jQuery could not be found.");
       spun.attr({spinner: spinnerID}); // Keep track of the spinner for the element
     });
   };
-  
+
   $.fn.unspin = function(){
     return this.each(function(){
       $("#"+$(this).attr("spinner")).hide();
diff --git a/public/javascripts/pebbles/jquery/validate.js b/public/javascripts/pebbles/jquery/validate.js
index 307476f..251188d 100644
--- a/public/javascripts/pebbles/jquery/validate.js
+++ b/public/javascripts/pebbles/jquery/validate.js
@@ -30,30 +30,30 @@ $.extend($.fn, {
 		if ( validator ) {
 			return validator;
 		}
-		
+
 		validator = new $.validator( options, this[0] );
-		$.data(this[0], 'validator', validator); 
-		
+		$.data(this[0], 'validator', validator);
+
 		if ( validator.settings.onsubmit ) {
-		
+
 			// allow suppresing validation by adding a cancel class to the submit button
 			this.find("input, button").filter(".cancel").click(function() {
 				validator.cancelSubmit = true;
 			});
-			
+
 			// when a submitHandler is used, capture the submitting button
 			if (validator.settings.submitHandler) {
 				this.find("input, button").filter(":submit").click(function() {
 					validator.submitButton = this;
 				});
 			}
-		
+
 			// validate the form on submit
 			this.submit( function( event ) {
 				if ( validator.settings.debug )
 					// prevent form submit to be able to see console output
 					event.preventDefault();
-					
+
 				function handle() {
 					if ( validator.settings.submitHandler ) {
 						if (validator.submitButton) {
@@ -69,7 +69,7 @@ $.extend($.fn, {
 					}
 					return true;
 				}
-					
+
 				// prevent submit for invalid forms or custom submit handlers
 				if ( validator.cancelSubmit ) {
 					validator.cancelSubmit = false;
@@ -87,7 +87,7 @@ $.extend($.fn, {
 				}
 			});
 		}
-		
+
 		return validator;
 	},
 	// http://docs.jquery.com/Plugins/Validation/valid
@@ -116,7 +116,7 @@ $.extend($.fn, {
 	// http://docs.jquery.com/Plugins/Validation/rules
 	rules: function(command, argument) {
 		var element = this[0];
-		
+
 		if (command) {
 			var settings = $.data(element.form, 'validator').settings;
 			var staticRules = settings.rules;
@@ -141,7 +141,7 @@ $.extend($.fn, {
 				return filtered;
 			}
 		}
-		
+
 		var data = $.validator.normalizeRules(
 		$.extend(
 			{},
@@ -150,14 +150,14 @@ $.extend($.fn, {
 			$.validator.attributeRules(element),
 			$.validator.staticRules(element)
 		), element);
-		
+
 		// make sure required is at front
 		if (data.required) {
 			var param = data.required;
 			delete data.required;
 			data = $.extend({required: param}, data);
 		}
-		
+
 		return data;
 	}
 });
@@ -180,7 +180,7 @@ $.validator = function( options, form ) {
 };
 
 $.validator.format = function(source, params) {
-	if ( arguments.length == 1 ) 
+	if ( arguments.length == 1 )
 		return function() {
 			var args = $.makeArray(arguments);
 			args.unshift(source);
@@ -199,7 +199,7 @@ $.validator.format = function(source, params) {
 };
 
 $.extend($.validator, {
-	
+
 	defaults: {
 		messages: {},
 		groups: {},
@@ -215,7 +215,7 @@ $.extend($.validator, {
 		ignoreTitle: false,
 		onfocusin: function(element) {
 			this.lastActive = element;
-				
+
 			// hide error label and remove error class on focus if enabled
 			if ( this.settings.focusCleanup && !this.blockFocusCleanup ) {
 				this.settings.unhighlight && this.settings.unhighlight.call( this, element, this.settings.errorClass, this.settings.validClass );
@@ -270,11 +270,11 @@ $.extend($.validator, {
 		max: $.validator.format("Please enter a value less than or equal to {0}."),
 		min: $.validator.format("Please enter a value greater than or equal to {0}.")
 	},
-	
+
 	autoCreateRanges: false,
-	
+
 	prototype: {
-		
+
 		init: function() {
 			this.labelContainer = $(this.settings.errorLabelContainer);
 			this.errorContext = this.labelContainer.length && this.labelContainer || $(this.currentForm);
@@ -285,7 +285,7 @@ $.extend($.validator, {
 			this.pending = {};
 			this.invalid = {};
 			this.reset();
-			
+
 			var groups = (this.groups = {});
 			$.each(this.settings.groups, function(key, value) {
 				$.each(value.split(/\s/), function(index, name) {
@@ -296,7 +296,7 @@ $.extend($.validator, {
 			$.each(rules, function(key, value) {
 				rules[key] = $.validator.normalizeRule(value);
 			});
-			
+
 			function delegate(event) {
 				var validator = $.data(this[0].form, "validator");
 				validator.settings["on" + event.type] && validator.settings["on" + event.type].call(validator, this[0] );
@@ -319,15 +319,15 @@ $.extend($.validator, {
 			this.showErrors();
 			return this.valid();
 		},
-		
+
 		checkForm: function() {
 			this.prepareForm();
 			for ( var i = 0, elements = (this.currentElements = this.elements()); elements[i]; i++ ) {
 				this.check( elements[i] );
 			}
-			return this.valid(); 
+			return this.valid();
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Validator/element
 		element: function( element ) {
 			element = this.clean( element );
@@ -369,7 +369,7 @@ $.extend($.validator, {
 				? this.settings.showErrors.call( this, this.errorMap, this.errorList )
 				: this.defaultShowErrors();
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Validator/resetForm
 		resetForm: function() {
 			if ( $.fn.resetForm )
@@ -379,30 +379,30 @@ $.extend($.validator, {
 			this.hideErrors();
 			this.elements().removeClass( this.settings.errorClass );
 		},
-		
+
 		numberOfInvalids: function() {
 			return this.objectLength(this.invalid);
 		},
-		
+
 		objectLength: function( obj ) {
 			var count = 0;
 			for ( var i in obj )
 				count++;
 			return count;
 		},
-		
+
 		hideErrors: function() {
 			this.addWrapper( this.toHide ).hide();
 		},
-		
+
 		valid: function() {
 			return this.size() == 0;
 		},
-		
+
 		size: function() {
 			return this.errorList.length;
 		},
-		
+
 		focusInvalid: function() {
 			if( this.settings.focusInvalid ) {
 				try {
@@ -412,18 +412,18 @@ $.extend($.validator, {
 				}
 			}
 		},
-		
+
 		findLastActive: function() {
 			var lastActive = this.lastActive;
 			return lastActive && $.grep(this.errorList, function(n) {
 				return n.element.name == lastActive.name;
 			}).length == 1 && lastActive;
 		},
-		
+
 		elements: function() {
 			var validator = this,
 				rulesCache = {};
-			
+
 			// select all valid inputs inside the form (no submit or reset buttons)
 			// workaround $Query([]).add until http://dev.jquery.com/ticket/2114 is solved
 			return $([]).add(this.currentForm.elements)
@@ -432,24 +432,24 @@ $.extend($.validator, {
 			.not( this.settings.ignore )
 			.filter(function() {
 				!this.name && validator.settings.debug && window.console && console.error( "%o has no name assigned", this);
-			
+
 				// select only the first element for each name, and only those with rules specified
 				if ( this.name in rulesCache || !validator.objectLength($(this).rules()) )
 					return false;
-				
+
 				rulesCache[this.name] = true;
 				return true;
 			});
 		},
-		
+
 		clean: function( selector ) {
 			return $( selector )[0];
 		},
-		
+
 		errors: function() {
 			return $( this.settings.errorElement + "." + this.settings.errorClass, this.errorContext );
 		},
-		
+
 		reset: function() {
 			this.successList = [];
 			this.errorList = [];
@@ -459,32 +459,32 @@ $.extend($.validator, {
 			this.formSubmitted = false;
 			this.currentElements = $([]);
 		},
-		
+
 		prepareForm: function() {
 			this.reset();
 			this.toHide = this.errors().add( this.containers );
 		},
-		
+
 		prepareElement: function( element ) {
 			this.reset();
 			this.toHide = this.errorsFor(element);
 		},
-	
+
 		check: function( element ) {
 			element = this.clean( element );
-			
+
 			// if radio/checkbox, validate first element in group instead
 			if (this.checkable(element)) {
 				element = this.findByName( element.name )[0];
 			}
-			
+
 			var rules = $(element).rules();
 			var dependencyMismatch = false;
 			for( method in rules ) {
 				var rule = { method: method, parameters: rules[method] };
 				try {
 					var result = $.validator.methods[method].call( this, element.value.replace(/\r/g, ""), element, rule.parameters );
-					
+
 					// if a method indicates that the field is optional and therefore valid,
 					// don't mark it as valid when there are no other rules
 					if ( result == "dependency-mismatch" ) {
@@ -492,12 +492,12 @@ $.extend($.validator, {
 						continue;
 					}
 					dependencyMismatch = false;
-					
+
 					if ( result == "pending" ) {
 						this.toHide = this.toHide.not( this.errorsFor(element) );
 						return;
 					}
-					
+
 					if( !result ) {
 						this.formatAndAdd( element, rule );
 						return false;
@@ -514,20 +514,20 @@ $.extend($.validator, {
 				this.successList.push(element);
 			return true;
 		},
-		
+
 		// return the custom message for the given element and validation method
 		// specified in the element's "messages" metadata
 		customMetaMessage: function(element, method) {
 			if (!$.metadata)
 				return;
-			
+
 			var meta = this.settings.meta
 				? $(element).metadata()[this.settings.meta]
 				: $(element).metadata();
-			
+
 			return meta && meta.messages && meta.messages[method];
 		},
-		
+
 		// return the custom message for the given element name and validation method
 		customMessage: function( name, method ) {
 			var m = this.settings.messages[name];
@@ -535,7 +535,7 @@ $.extend($.validator, {
 				? m
 				: m[method]);
 		},
-		
+
 		// return the first defined argument, allowing empty strings
 		findDefined: function() {
 			for(var i = 0; i < arguments.length; i++) {
@@ -544,7 +544,7 @@ $.extend($.validator, {
 			}
 			return undefined;
 		},
-		
+
 		defaultMessage: function( element, method) {
 			return this.findDefined(
 				this.customMessage( element.name, method ),
@@ -555,10 +555,10 @@ $.extend($.validator, {
 				"<strong>Warning: No message defined for " + element.name + "</strong>"
 			);
 		},
-		
+
 		formatAndAdd: function( element, rule ) {
 			var message = this.defaultMessage( element, rule.method );
-			if ( typeof message == "function" ) 
+			if ( typeof message == "function" )
 				message = message.call(this, rule.parameters, element);
 			this.errorList.push({
 				message: message,
@@ -567,13 +567,13 @@ $.extend($.validator, {
 			this.errorMap[element.name] = message;
 			this.submitted[element.name] = message;
 		},
-		
+
 		addWrapper: function(toToggle) {
 			if ( this.settings.wrapper )
 				toToggle = toToggle.add( toToggle.parent( this.settings.wrapper ) );
 			return toToggle;
 		},
-		
+
 		defaultShowErrors: function() {
 			for ( var i = 0; this.errorList[i]; i++ ) {
 				var error = this.errorList[i];
@@ -597,23 +597,23 @@ $.extend($.validator, {
 			this.hideErrors();
 			this.addWrapper( this.toShow ).show();
 		},
-		
+
 		validElements: function() {
 			return this.currentElements.not(this.invalidElements());
 		},
-		
+
 		invalidElements: function() {
 			return $(this.errorList).map(function() {
 				return this.element;
 			});
 		},
-		
+
 		showLabel: function(element, message) {
 			var label = this.errorsFor( element );
 			if ( label.length ) {
 				// refresh error/success class
 				label.removeClass().addClass( this.settings.errorClass );
-			
+
 				// check if we have a generated label, replace the message then
 				label.attr("generated") && label.html(message);
 			} else {
@@ -640,11 +640,11 @@ $.extend($.validator, {
 			}
 			this.toShow = this.toShow.add(label);
 		},
-		
+
 		errorsFor: function(element) {
 			return this.errors().filter("[for='" + this.idOrName(element) + "']");
 		},
-		
+
 		idOrName: function(element) {
 			return this.groups[element.name] || (this.checkable(element) ? element.name : element.id || element.name);
 		},
@@ -652,7 +652,7 @@ $.extend($.validator, {
 		checkable: function( element ) {
 			return /radio|checkbox/i.test(element.type);
 		},
-		
+
 		findByName: function( name ) {
 			// select by name and filter by form for performance over form.find("[name=...]")
 			var form = this.currentForm;
@@ -660,7 +660,7 @@ $.extend($.validator, {
 				return element.form == form && element.name == name && element  || null;
 			});
 		},
-		
+
 		getLength: function(value, element) {
 			switch( element.nodeName.toLowerCase() ) {
 			case 'select':
@@ -671,13 +671,13 @@ $.extend($.validator, {
 			}
 			return value.length;
 		},
-	
+
 		depend: function(param, element) {
 			return this.dependTypes[typeof param]
 				? this.dependTypes[typeof param](param, element)
 				: true;
 		},
-	
+
 		dependTypes: {
 			"boolean": function(param, element) {
 				return param;
@@ -689,18 +689,18 @@ $.extend($.validator, {
 				return param(element);
 			}
 		},
-		
+
 		optional: function(element) {
 			return !$.validator.methods.required.call(this, $.trim(element.value), element) && "dependency-mismatch";
 		},
-		
+
 		startRequest: function(element) {
 			if (!this.pending[element.name]) {
 				this.pendingRequest++;
 				this.pending[element.name] = true;
 			}
 		},
-		
+
 		stopRequest: function(element, valid) {
 			this.pendingRequest--;
 			// sometimes synchronization fails, make sure pendingRequest is never < 0
@@ -713,7 +713,7 @@ $.extend($.validator, {
 				$(this.currentForm).triggerHandler("invalid-form", [this]);
 			}
 		},
-		
+
 		previousValue: function(element) {
 			return $.data(element, "previousValue") || $.data(element, "previousValue", previous = {
 				old: null,
@@ -721,9 +721,9 @@ $.extend($.validator, {
 				message: this.defaultMessage( element, "remote" )
 			});
 		}
-		
+
 	},
-	
+
 	classRuleSettings: {
 		required: {required: true},
 		email: {email: true},
@@ -736,13 +736,13 @@ $.extend($.validator, {
 		digits: {digits: true},
 		creditcard: {creditcard: true}
 	},
-	
+
 	addClassRules: function(className, rules) {
 		className.constructor == String ?
 			this.classRuleSettings[className] = rules :
 			$.extend(this.classRuleSettings, className);
 	},
-	
+
 	classRules: function(element) {
 		var rules = {};
 		var classes = $(element).attr('class');
@@ -753,35 +753,35 @@ $.extend($.validator, {
 		});
 		return rules;
 	},
-	
+
 	attributeRules: function(element) {
 		var rules = {};
 		var $element = $(element);
-		
+
 		for (method in $.validator.methods) {
 			var value = $element.attr(method);
 			if (value) {
 				rules[method] = value;
 			}
 		}
-		
+
 		// maxlength may be returned as -1, 2147483647 (IE) and 524288 (safari) for text inputs
 		if (rules.maxlength && /-1|2147483647|524288/.test(rules.maxlength)) {
 			delete rules.maxlength;
 		}
-		
+
 		return rules;
 	},
-	
+
 	metadataRules: function(element) {
 		if (!$.metadata) return {};
-		
+
 		var meta = $.data(element.form, 'validator').settings.meta;
 		return meta ?
 			$(element).metadata()[meta] :
 			$(element).metadata();
 	},
-	
+
 	staticRules: function(element) {
 		var rules = {};
 		var validator = $.data(element.form, 'validator');
@@ -790,7 +790,7 @@ $.extend($.validator, {
 		}
 		return rules;
 	},
-	
+
 	normalizeRules: function(rules, element) {
 		// handle dependency check
 		$.each(rules, function(prop, val) {
@@ -816,12 +816,12 @@ $.extend($.validator, {
 				}
 			}
 		});
-		
+
 		// evaluate parameters
 		$.each(rules, function(rule, parameter) {
 			rules[rule] = $.isFunction(parameter) ? parameter(element) : parameter;
 		});
-		
+
 		// clean number parameters
 		$.each(['minlength', 'maxlength', 'min', 'max'], function() {
 			if (rules[this]) {
@@ -833,7 +833,7 @@ $.extend($.validator, {
 				rules[this] = [Number(rules[this][0]), Number(rules[this][1])];
 			}
 		});
-		
+
 		if ($.validator.autoCreateRanges) {
 			// auto-create ranges
 			if (rules.min && rules.max) {
@@ -847,15 +847,15 @@ $.extend($.validator, {
 				delete rules.maxlength;
 			}
 		}
-		
+
 		// To support custom messages in metadata ignore rule methods titled "messages"
 		if (rules.messages) {
 			delete rules.messages
 		}
-		
+
 		return rules;
 	},
-	
+
 	// Converts a simple string to a {string: true} rule, e.g., "required" to {required:true}
 	normalizeRule: function(data) {
 		if( typeof data == "string" ) {
@@ -867,7 +867,7 @@ $.extend($.validator, {
 		}
 		return data;
 	},
-	
+
 	// http://docs.jquery.com/Plugins/Validation/Validator/addMethod
 	addMethod: function(name, method, message) {
 		$.validator.methods[name] = method;
@@ -895,20 +895,20 @@ $.extend($.validator, {
 				return $.trim(value).length > 0;
 			}
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/remote
 		remote: function(value, element, param) {
 			if ( this.optional(element) )
 				return "dependency-mismatch";
-			
+
 			var previous = this.previousValue(element);
-			
+
 			if (!this.settings.messages[element.name] )
 				this.settings.messages[element.name] = {};
 			this.settings.messages[element.name].remote = typeof previous.message == "function" ? previous.message(value) : previous.message;
-			
-			param = typeof param == "string" && {url:param} || param; 
-			
+
+			param = typeof param == "string" && {url:param} || param;
+
 			if ( previous.old !== value ) {
 				previous.old = value;
 				var validator = this;
@@ -949,75 +949,75 @@ $.extend($.validator, {
 		minlength: function(value, element, param) {
 			return this.optional(element) || this.getLength($.trim(value), element) >= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/maxlength
 		maxlength: function(value, element, param) {
 			return this.optional(element) || this.getLength($.trim(value), element) <= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/rangelength
 		rangelength: function(value, element, param) {
 			var length = this.getLength($.trim(value), element);
 			return this.optional(element) || ( length >= param[0] && length <= param[1] );
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/min
 		min: function( value, element, param ) {
 			return this.optional(element) || value >= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/max
 		max: function( value, element, param ) {
 			return this.optional(element) || value <= param;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/range
 		range: function( value, element, param ) {
 			return this.optional(element) || ( value >= param[0] && value <= param[1] );
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/email
 		email: function(value, element) {
 			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
 			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/url
 		url: function(value, element) {
 			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/iri/
 			return this.optional(element) || /^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(value);
 		},
-        
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/date
 		date: function(value, element) {
 			return this.optional(element) || !/Invalid|NaN/.test(new Date(value));
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/dateISO
 		dateISO: function(value, element) {
 			return this.optional(element) || /^\d{4}[\/-]\d{1,2}[\/-]\d{1,2}$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/dateDE
 		dateDE: function(value, element) {
 			return this.optional(element) || /^\d\d?\.\d\d?\.\d\d\d?\d?$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/number
 		number: function(value, element) {
 			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:,\d{3})+)(?:\.\d+)?$/.test(value);
 		},
-	
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/numberDE
 		numberDE: function(value, element) {
 			return this.optional(element) || /^-?(?:\d+|\d{1,3}(?:\.\d{3})+)(?:,\d+)?$/.test(value);
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/digits
 		digits: function(value, element) {
 			return this.optional(element) || /^\d+$/.test(value);
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/creditcard
 		// based on http://en.wikipedia.org/wiki/Luhn
 		creditcard: function(value, element) {
@@ -1045,20 +1045,20 @@ $.extend($.validator, {
 
 			return (nCheck % 10) == 0;
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/accept
 		accept: function(value, element, param) {
 			param = typeof param == "string" ? param.replace(/,/g, '|') : "png|jpe?g|gif";
-			return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i")); 
+			return this.optional(element) || value.match(new RegExp(".(" + param + ")$", "i"));
 		},
-		
+
 		// http://docs.jquery.com/Plugins/Validation/Methods/equalTo
 		equalTo: function(value, element, param) {
 			return value == $(param).val();
 		}
-		
+
 	}
-	
+
 });
 
 // deprecated, use $.validator.format instead
@@ -1068,7 +1068,7 @@ $.format = $.validator.format;
 
 // ajax mode: abort
 // usage: $.ajax({ mode: "abort"[, port: "uniqueport"]});
-// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort() 
+// if mode:"abort" is used, the previous request on that port (port can be undefined) is aborted via XMLHttpRequest.abort()
 ;(function($) {
 	var ajax = $.ajax;
 	var pendingRequests = {};
@@ -1090,13 +1090,13 @@ $.format = $.validator.format;
 // IE has native support, in other browsers, use event caputuring (neither bubbles)
 
 // provides delegate(type: String, delegate: Selector, handler: Callback) plugin for easier event delegation
-// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target 
+// handler is only called when $(event.target).is(delegate), in the scope of the jquery-object for event.target
 
 // provides triggerEvent(type: String, target: Element) to trigger delegated events
 ;(function($) {
 	$.each({
 		focus: 'focusin',
-		blur: 'focusout'	
+		blur: 'focusout'
 	}, function( original, fix ){
 		$.event.special[fix] = {
 			setup:function() {
diff --git a/public/javascripts/pebbles/lightbox.js b/public/javascripts/pebbles/lightbox.js
index 6d276c7..7eaaa46 100644
--- a/public/javascripts/pebbles/lightbox.js
+++ b/public/javascripts/pebbles/lightbox.js
@@ -1,5 +1,5 @@
 /*
-	Lightbox JS: Fullsize Image Overlays 
+	Lightbox JS: Fullsize Image Overlays
 	by Lokesh Dhakar - http://www.huddletogether.com
 
 	For more information on this script, visit:
@@ -7,11 +7,11 @@
 
 	Licensed under the Creative Commons Attribution 2.5 License - http://creativecommons.org/licenses/by/2.5/
 	(basically, do anything you want, just leave my name and link)
-	
+
 	Table of Contents
 	-----------------
 	Configuration
-	
+
 	Functions
 	- getPageScroll()
 	- getPageSize()
@@ -22,7 +22,7 @@
 	- hideLightbox()
 	- initLightbox()
 	- addLoadEvent()
-	
+
 	Function Calls
 	- addLoadEvent(initLightbox)
 
@@ -35,8 +35,8 @@
 //
 
 // If you would like to use a custom loading image or close button reference them in the next two lines.
-var loadingImage = '/images/loading.gif';		
-var closeButton = '/images/close.gif';		
+var loadingImage = '/images/loading.gif';
+var closeButton = '/images/close.gif';
 
 
 
@@ -59,7 +59,7 @@ function getPageScroll(){
 		yScroll = document.body.scrollTop;
 	}
 
-	arrayPageScroll = new Array('',yScroll) 
+	arrayPageScroll = new Array('',yScroll)
 	return arrayPageScroll;
 }
 
@@ -72,10 +72,10 @@ function getPageScroll(){
 // Edit for Firefox by pHaez
 //
 function getPageSize(){
-	
+
 	var xScroll, yScroll;
-	
-	if (window.innerHeight && window.scrollMaxY) {	
+
+	if (window.innerHeight && window.scrollMaxY) {
 		xScroll = document.body.scrollWidth;
 		yScroll = window.innerHeight + window.scrollMaxY;
 	} else if (document.body.scrollHeight > document.body.offsetHeight){ // all but Explorer Mac
@@ -85,7 +85,7 @@ function getPageSize(){
 		xScroll = document.body.offsetWidth;
 		yScroll = document.body.offsetHeight;
 	}
-	
+
 	var windowWidth, windowHeight;
 	if (self.innerHeight) {	// all except Explorer
 		windowWidth = self.innerWidth;
@@ -96,24 +96,24 @@ function getPageSize(){
 	} else if (document.body) { // other Explorers
 		windowWidth = document.body.clientWidth;
 		windowHeight = document.body.clientHeight;
-	}	
-	
+	}
+
 	// for small pages with total height less then height of the viewport
 	if(yScroll < windowHeight){
 		pageHeight = windowHeight;
-	} else { 
+	} else {
 		pageHeight = yScroll;
 	}
 
 	// for small pages with total width less then width of the viewport
-	if(xScroll < windowWidth){	
+	if(xScroll < windowWidth){
 		pageWidth = windowWidth;
 	} else {
 		pageWidth = xScroll;
 	}
 
 
-	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight) 
+	arrayPageSize = new Array(pageWidth,pageHeight,windowWidth,windowHeight)
 	return arrayPageSize;
 }
 
@@ -145,7 +145,7 @@ function getKey(e){
 		keycode = e.which;
 	}
 	key = String.fromCharCode(keycode).toLowerCase();
-	
+
 	if(key == 'x'){ hideLightbox(); }
 }
 
@@ -154,7 +154,7 @@ function getKey(e){
 // listenKey()
 //
 function listenKey () {	document.onkeypress = getKey; }
-	
+
 
 //
 // showLightbox()
@@ -170,7 +170,7 @@ function showLightbox(objLink)
 	var objLoadingImage = document.getElementById('loadingImage');
 	var objLightboxDetails = document.getElementById('lightboxDetails');
 
-	
+
 	var arrayPageSize = getPageSize();
 	var arrayPageScroll = getPageScroll();
 
@@ -195,13 +195,13 @@ function showLightbox(objLink)
 		// and the image placed outside the viewport
 		var lightboxTop = arrayPageScroll[1] + ((arrayPageSize[3] - 35 - imgPreload.height) / 2);
 		var lightboxLeft = ((arrayPageSize[0] - 20 - imgPreload.width) / 2);
-		
+
 		objLightbox.style.top = (lightboxTop < 0) ? "0px" : lightboxTop + "px";
 		objLightbox.style.left = (lightboxLeft < 0) ? "0px" : lightboxLeft + "px";
 
 
 		objLightboxDetails.style.width = imgPreload.width + 'px';
-		
+
 		if(objLink.getAttribute('title')){
 			objCaption.style.display = 'block';
 			//objCaption.style.width = imgPreload.width + 'px';
@@ -209,12 +209,12 @@ function showLightbox(objLink)
 		} else {
 			objCaption.style.display = 'none';
 		}
-		
+
 		// A small pause between the image loading and displaying is required with IE,
 		// this prevents the previous image displaying for a short burst causing flicker.
 		if (navigator.appVersion.indexOf("MSIE")!=-1){
 			pause(250);
-		} 
+		}
 
 		if (objLoadingImage) {	objLoadingImage.style.display = 'none'; }
 
@@ -224,14 +224,14 @@ function showLightbox(objLink)
                 selects[i].style.visibility = "hidden";
         }
 
-	
+
 		objLightbox.style.display = 'block';
 
 		// After image is loaded, update the overlay height as the new image might have
 		// increased the overall page height.
 		arrayPageSize = getPageSize();
 		objOverlay.style.height = (arrayPageSize[1] + 'px');
-		
+
 		// Check for 'x' keypress
 		listenKey();
 
@@ -239,7 +239,7 @@ function showLightbox(objLink)
 	}
 
 	imgPreload.src = objLink.href;
-	
+
 }
 
 
@@ -281,7 +281,7 @@ function hideLightbox()
 //
 function initLightbox()
 {
-	
+
 	if (!document.getElementsByTagName){ return; }
 	var anchors = document.getElementsByTagName("a");
 
@@ -301,7 +301,7 @@ function initLightbox()
 	//	</div>
 	// <div id="lightbox">
 	//		<a href="#" onclick="hideLightbox(); return false;" title="Click anywhere to close image">
-	//			<img id="closeButton" />		
+	//			<img id="closeButton" />
 	//			<img id="lightboxImage" />
 	//		</a>
 	//		<div id="lightboxDetails">
@@ -309,9 +309,9 @@ function initLightbox()
 	//			<div id="keyboardMsg"></div>
 	//		</div>
 	// </div>
-	
+
 	var objBody = document.getElementsByTagName("body").item(0);
-	
+
 	// create overlay div and hardcode some functional styles (aesthetic styles are in CSS file)
 	var objOverlay = document.createElement("div");
 	objOverlay.setAttribute('id','overlay');
@@ -323,13 +323,13 @@ function initLightbox()
 	objOverlay.style.zIndex = '90';
  	objOverlay.style.width = '100%';
 	objBody.insertBefore(objOverlay, objBody.firstChild);
-	
+
 	var arrayPageSize = getPageSize();
 	var arrayPageScroll = getPageScroll();
 
 	// preload and create loader image
 	var imgPreloader = new Image();
-	
+
 	// if loader image found, create link to hide lightbox and create loadingimage
 	imgPreloader.onload=function(){
 
@@ -337,7 +337,7 @@ function initLightbox()
 		objLoadingImageLink.setAttribute('href','#');
 		objLoadingImageLink.onclick = function () {hideLightbox(); return false;}
 		objOverlay.appendChild(objLoadingImageLink);
-		
+
 		var objLoadingImage = document.createElement("img");
 		objLoadingImage.src = loadingImage;
 		objLoadingImage.setAttribute('id','loadingImage');
@@ -357,9 +357,9 @@ function initLightbox()
 	objLightbox.setAttribute('id','lightbox');
 	objLightbox.style.display = 'none';
 	objLightbox.style.position = 'absolute';
-	objLightbox.style.zIndex = '100';	
+	objLightbox.style.zIndex = '100';
 	objBody.insertBefore(objLightbox, objOverlay.nextSibling);
-	
+
 	// create link
 	var objLink = document.createElement("a");
 	objLink.setAttribute('href','#');
@@ -370,7 +370,7 @@ function initLightbox()
 	// preload and create close button image
 	var imgPreloadCloseButton = new Image();
 
-	// if close button image found, 
+	// if close button image found,
 	imgPreloadCloseButton.onload=function(){
 
 		var objCloseButton = document.createElement("img");
@@ -389,7 +389,7 @@ function initLightbox()
 	var objImage = document.createElement("img");
 	objImage.setAttribute('id','lightboxImage');
 	objLink.appendChild(objImage);
-	
+
 	// create details div, a container for the caption and keyboard message
 	var objLightboxDetails = document.createElement("div");
 	objLightboxDetails.setAttribute('id','lightboxDetails');
@@ -419,7 +419,7 @@ function initLightbox()
 // Function found at Simon Willison's weblog - http://simon.incutio.com/
 //
 function addLoadEvent(func)
-{	
+{
 	var oldonload = window.onload;
 	if (typeof window.onload != 'function'){
     	window.onload = func;
diff --git a/public/javascripts/pebbles/lowpro.js b/public/javascripts/pebbles/lowpro.js
index fc0c992..c14e03d 100644
--- a/public/javascripts/pebbles/lowpro.js
+++ b/public/javascripts/pebbles/lowpro.js
@@ -3,10 +3,10 @@ LowPro.Version = '0.5';
 LowPro.CompatibleWithPrototype = '1.6';
 
 if (Prototype.Version.indexOf(LowPro.CompatibleWithPrototype) != 0 && console && console.warn)
-  console.warn("This version of Low Pro is tested with Prototype " + LowPro.CompatibleWithPrototype + 
+  console.warn("This version of Low Pro is tested with Prototype " + LowPro.CompatibleWithPrototype +
                   " it may not work as expected with this version (" + Prototype.Version + ")");
 
-if (!Element.addMethods) 
+if (!Element.addMethods)
   Element.addMethods = function(o) { Object.extend(Element.Methods, o) };
 
 // Simple utility methods for working with the DOM
@@ -16,14 +16,14 @@ DOM = {};
 DOM.Builder = {
 	tagFunc : function(tag) {
 	  return function() {
-	    var attrs, children; 
-	    if (arguments.length>0) { 
-	      if (arguments[0].nodeName || 
-	        typeof arguments[0] == "string") 
-	        children = arguments; 
-	      else { 
-	        attrs = arguments[0]; 
-	        children = Array.prototype.slice.call(arguments, 1); 
+	    var attrs, children;
+	    if (arguments.length>0) {
+	      if (arguments[0].nodeName ||
+	        typeof arguments[0] == "string")
+	        children = arguments;
+	      else {
+	        attrs = arguments[0];
+	        children = Array.prototype.slice.call(arguments, 1);
 	      };
 	    }
 	    return DOM.Builder.create(tag, attrs, children);
@@ -32,9 +32,9 @@ DOM.Builder = {
 	create : function(tag, attrs, children) {
 		attrs = attrs || {}; children = children || []; tag = tag.toLowerCase();
 		var el = new Element(tag, attrs);
-	  
+
 		for (var i=0; i<children.length; i++) {
-			if (typeof children[i] == 'string') 
+			if (typeof children[i] == 'string')
 			  children[i] = document.createTextNode(children[i]);
 			el.appendChild(children[i]);
 		}
@@ -43,14 +43,14 @@ DOM.Builder = {
 };
 
 // Automatically create node builders as $tagName.
-(function() { 
-	var els = ("p|div|span|strong|em|img|table|tr|td|th|thead|tbody|tfoot|pre|code|" + 
-				     "h1|h2|h3|h4|h5|h6|ul|ol|li|form|input|textarea|legend|fieldset|" + 
+(function() {
+	var els = ("p|div|span|strong|em|img|table|tr|td|th|thead|tbody|tfoot|pre|code|" +
+				     "h1|h2|h3|h4|h5|h6|ul|ol|li|form|input|textarea|legend|fieldset|" +
 				     "select|option|blockquote|cite|br|hr|dd|dl|dt|address|a|button|abbr|acronym|" +
-				     "script|link|style|bdo|ins|del|object|param|col|colgroup|optgroup|caption|" + 
+				     "script|link|style|bdo|ins|del|object|param|col|colgroup|optgroup|caption|" +
 				     "label|dfn|kbd|samp|var").split("|");
   var el, i=0;
-	while (el = els[i++]) 
+	while (el = els[i++])
 	  window['$' + el] = DOM.Builder.tagFunc(el);
 })();
 
@@ -92,28 +92,28 @@ Object.extend(Event, {
 Event.addBehavior = function(rules) {
   var ab = this.addBehavior;
   Object.extend(ab.rules, rules);
-  
+
   if (!ab.responderApplied) {
     Ajax.Responders.register({
-      onComplete : function() { 
-        if (Event.addBehavior.reassignAfterAjax) 
+      onComplete : function() {
+        if (Event.addBehavior.reassignAfterAjax)
           setTimeout(function() { ab.reload() }, 10);
       }
     });
     ab.responderApplied = true;
   }
-  
+
   if (ab.autoTrigger) {
     this.onReady(ab.load.bind(ab, rules));
   }
-  
+
 };
 
 Object.extend(Event.addBehavior, {
   rules : {}, cache : [],
   reassignAfterAjax : false,
   autoTrigger : true,
-  
+
   load : function(rules) {
     for (var selector in rules) {
       var observer = rules[selector];
@@ -128,7 +128,7 @@ Object.extend(Event.addBehavior, {
           } else {
             if (!element.$$assigned || !element.$$assigned.include(observer)) {
               if (observer.attach) observer.attach(element);
-              
+
               else observer.call($(element));
               element.$$assigned = element.$$assigned || [];
               element.$$assigned.push(observer);
@@ -138,26 +138,26 @@ Object.extend(Event.addBehavior, {
       });
     }
   },
-  
+
   unload : function() {
     this.cache.each(function(c) {
       Event.stopObserving.apply(Event, c);
     });
     this.cache = [];
   },
-  
+
   reload: function() {
     var ab = Event.addBehavior;
-    ab.unload(); 
+    ab.unload();
     ab.load(ab.rules);
   },
-  
+
   _wrapObserver: function(observer) {
     return function(event) {
-      if (observer.call(this, event) === false) event.stop(); 
+      if (observer.call(this, event) === false) event.stop();
     }
   }
-  
+
 });
 
 Event.observe(window, 'unload', Event.addBehavior.unload.bind(Event.addBehavior));
@@ -169,15 +169,15 @@ $$$ = Event.addBehavior.bind(Event);
 // and their behavior.  Use Behavior.create() to make a new behavior class then use attach() to
 // glue it to an element.  Each element then gets it's own instance of the behavior and any
 // methods called onxxx are bound to the relevent event.
-// 
+//
 // Usage:
-// 
+//
 // var MyBehavior = Behavior.create({
-//   onmouseover : function() { this.element.addClassName('bong') } 
+//   onmouseover : function() { this.element.addClassName('bong') }
 // });
 //
 // Event.addBehavior({ 'a.rollover' : MyBehavior });
-// 
+//
 // If you need to pass additional values to initialize use:
 //
 // Event.addBehavior({ 'a.rollover' : MyBehavior(10, { thing : 15 }) })
@@ -197,7 +197,7 @@ var Behavior = {
     if (Object.isFunction(properties[0]))
       parent = properties.shift();
 
-      var behavior = function() { 
+      var behavior = function() {
         var behavior = arguments.callee;
         if (!this.initialize) {
           var args = $A(arguments);
@@ -207,7 +207,7 @@ var Behavior = {
             behavior.attach.apply(behavior, initArgs);
           };
         } else {
-          var args = (arguments.length == 2 && arguments[1] instanceof Array) ? 
+          var args = (arguments.length == 2 && arguments[1] instanceof Array) ?
                       arguments[1] : Array.prototype.slice.call(arguments, 1);
 
           this.element = $(arguments[0]);
@@ -283,8 +283,8 @@ Remote.Link = Behavior.create(Remote.Base, {
 Remote.Form = Behavior.create(Remote.Base, {
   onclick : function(e) {
     var sourceElement = e.element();
-    
-    if (['input', 'button'].include(sourceElement.nodeName.toLowerCase()) && 
+
+    if (['input', 'button'].include(sourceElement.nodeName.toLowerCase()) &&
         sourceElement.type == 'submit')
       this._submitButton = sourceElement;
   },
diff --git a/public/javascripts/pebbles/markerGroup.js b/public/javascripts/pebbles/markerGroup.js
index 021c9db..f1e2a9c 100644
--- a/public/javascripts/pebbles/markerGroup.js
+++ b/public/javascripts/pebbles/markerGroup.js
@@ -8,7 +8,7 @@ GMarkerGroup.prototype = new GOverlay();
 
 GMarkerGroup.prototype.initialize = function(map) {
     this.map = map;
-    
+
     if(this.active){
 	for(var i = 0 , len = this.markers.length; i < len; i++) {
 	    this.map.addOverlay(this.markers[i]);
@@ -104,9 +104,9 @@ GMarkerGroup.prototype.centerAndZoomOnMarkers = function() {
 	}
 	if(tmpMarkers.length > 0){
     	    this.map.centerAndZoomOnMarkers(tmpMarkers);
-	} 
+	}
     }
-}	
+}
 
 //Deactivate the Group Overlay (convenience method)
 GMarkerGroup.prototype.deactivate = function(){
diff --git a/public/javascripts/pebbles/scriptaculous.js b/public/javascripts/pebbles/scriptaculous.js
index 6cfe36e..781359b 100644
--- a/public/javascripts/pebbles/scriptaculous.js
+++ b/public/javascripts/pebbles/scriptaculous.js
@@ -1,7 +1,7 @@
 // script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
 // "Software"), to deal in the Software without restriction, including
@@ -9,7 +9,7 @@
 // distribute, sublicense, and/or sell copies of the Software, and to
 // permit persons to whom the Software is furnished to do so, subject to
 // the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be
 // included in all copies or substantial portions of the Software.
 //
@@ -35,15 +35,15 @@ var Scriptaculous = {
       var r = versionString.split('.');
       return parseInt(r[0])*100000 + parseInt(r[1])*1000 + parseInt(r[2]);
     }
- 
-    if((typeof Prototype=='undefined') || 
-       (typeof Element == 'undefined') || 
+
+    if((typeof Prototype=='undefined') ||
+       (typeof Element == 'undefined') ||
        (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) < 
+       (convertVersionString(Prototype.Version) <
         convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
        throw("script.aculo.us requires the Prototype JavaScript framework >= " +
         Scriptaculous.REQUIRED_PROTOTYPE);
-    
+
     $A(document.getElementsByTagName("script")).findAll( function(s) {
       return (s.src && s.src.match(/scriptaculous\.js(\?.*)?$/))
     }).each( function(s) {
diff --git a/public/javascripts/pebbles/slider.js b/public/javascripts/pebbles/slider.js
index cc46fe3..e0591d7 100644
--- a/public/javascripts/pebbles/slider.js
+++ b/public/javascripts/pebbles/slider.js
@@ -1,6 +1,6 @@
 // script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008
 
-// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs 
+// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs
 //
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
@@ -16,13 +16,13 @@ if (!Control) var Control = { };
 Control.Slider = Class.create({
   initialize: function(handle, track, options) {
     var slider = this;
-    
+
     if (Object.isArray(handle)) {
       this.handles = handle.collect( function(e) { return $(e) });
     } else {
       this.handles = [$(handle)];
     }
-    
+
     this.track   = $(track);
     this.options = options || { };
 
@@ -30,7 +30,7 @@ Control.Slider = Class.create({
     this.increment = this.options.increment || 1;
     this.step      = parseInt(this.options.step || '1');
     this.range     = this.options.range || $R(0,1);
-    
+
     this.value     = 0; // assure backwards compat
     this.values    = this.handles.map( function() { return 0 });
     this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
@@ -45,13 +45,13 @@ Control.Slider = Class.create({
     // Will be used to align the handle onto the track, if necessary
     this.alignX = parseInt(this.options.alignX || '0');
     this.alignY = parseInt(this.options.alignY || '0');
-    
+
     this.trackLength = this.maximumOffset() - this.minimumOffset();
 
-    this.handleLength = this.isVertical() ? 
-      (this.handles[0].offsetHeight != 0 ? 
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) : 
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth : 
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
         this.handles[0].style.width.replace(/px$/,""));
 
     this.active   = false;
@@ -75,20 +75,20 @@ Control.Slider = Class.create({
     this.handles.each( function(h,i) {
       i = slider.handles.length-1-i;
       slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ? 
-          slider.options.sliderValue[i] : slider.options.sliderValue) || 
+        (Object.isArray(slider.options.sliderValue) ?
+          slider.options.sliderValue[i] : slider.options.sliderValue) ||
          slider.range.start), i);
       h.makePositioned().observe("mousedown", slider.eventMouseDown);
     });
-    
+
     this.track.observe("mousedown", this.eventMouseDown);
     document.observe("mouseup", this.eventMouseUp);
     document.observe("mousemove", this.eventMouseMove);
-    
+
     this.initialized = true;
   },
   dispose: function() {
-    var slider = this;    
+    var slider = this;
     Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
     Event.stopObserving(document, "mouseup", this.eventMouseUp);
     Event.stopObserving(document, "mousemove", this.eventMouseMove);
@@ -101,12 +101,12 @@ Control.Slider = Class.create({
   },
   setEnabled: function(){
     this.disabled = false;
-  },  
+  },
   getNearestValue: function(value){
     if (this.allowedValues){
       if (value >= this.allowedValues.max()) return(this.allowedValues.max());
       if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-      
+
       var offset = Math.abs(this.allowedValues[0] - value);
       var newValue = this.allowedValues[0];
       this.allowedValues.each( function(v) {
@@ -114,7 +114,7 @@ Control.Slider = Class.create({
         if (currentOffset <= offset){
           newValue = v;
           offset = currentOffset;
-        } 
+        }
       });
       return newValue;
     }
@@ -138,28 +138,28 @@ Control.Slider = Class.create({
     sliderValue = this.getNearestValue(sliderValue);
     this.values[handleIdx] = sliderValue;
     this.value = this.values[0]; // assure backwards compat
-    
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] = 
+
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
       this.translateToPx(sliderValue);
-    
+
     this.drawSpans();
     if (!this.dragging || !this.event) this.updateFinished();
   },
   setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta, 
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
       handleIdx || this.activeHandleIdx || 0);
   },
   translateToPx: function(value) {
     return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) * 
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
       (value - this.range.start)) + "px";
   },
   translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) * 
+    return ((offset/(this.trackLength-this.handleLength) *
       (this.range.end-this.range.start)) + this.range.start);
   },
   getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K); 
+    var v = this.values.sortBy(Prototype.K);
     range = range || 0;
     return $R(v[range],v[range+1]);
   },
@@ -167,12 +167,12 @@ Control.Slider = Class.create({
     return(this.isVertical() ? this.alignY : this.alignX);
   },
   maximumOffset: function(){
-    return(this.isVertical() ? 
+    return(this.isVertical() ?
       (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY : 
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth : 
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
         this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },  
+  },
   isVertical:  function(){
     return (this.axis == 'vertical');
   },
@@ -184,7 +184,7 @@ Control.Slider = Class.create({
       this.setSpan(this.options.startSpan,
         $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
     if (this.options.endSpan)
-      this.setSpan(this.options.endSpan, 
+      this.setSpan(this.options.endSpan,
         $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
   },
   setSpan: function(span, range) {
@@ -204,14 +204,14 @@ Control.Slider = Class.create({
     if (Event.isLeftClick(event)) {
       if (!this.disabled){
         this.active = true;
-        
+
         var handle = Event.element(event);
         var pointer  = [Event.pointerX(event), Event.pointerY(event)];
         var track = handle;
         if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track); 
+          var offsets  = Position.cumulativeOffset(this.track);
           this.event = event;
-          this.setValue(this.translateToValue( 
+          this.setValue(this.translateToValue(
            (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
           ));
           var offsets  = Position.cumulativeOffset(this.activeHandle);
@@ -219,14 +219,14 @@ Control.Slider = Class.create({
           this.offsetY = (pointer[1] - offsets[1]);
         } else {
           // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode) 
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
             handle = handle.parentNode;
-            
+
           if (this.handles.indexOf(handle)!=-1) {
             this.activeHandle    = handle;
             this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
             this.updateStyles();
-            
+
             var offsets  = Position.cumulativeOffset(this.activeHandle);
             this.offsetX = (pointer[0] - offsets[0]);
             this.offsetY = (pointer[1] - offsets[1]);
@@ -261,14 +261,14 @@ Control.Slider = Class.create({
     }
     this.active = false;
     this.dragging = false;
-  },  
+  },
   finishDrag: function(event, success) {
     this.active = false;
     this.dragging = false;
     this.updateFinished();
   },
   updateFinished: function() {
-    if (this.initialized && this.options.onChange) 
+    if (this.initialized && this.options.onChange)
       this.options.onChange(this.values.length>1 ? this.values : this.value, this);
     this.event = null;
   }
diff --git a/public/javascripts/pebbles/sound.js b/public/javascripts/pebbles/sound.js
index eba3843..6d193c7 100644
--- a/public/javascripts/pebbles/sound.js
+++ b/public/javascripts/pebbles/sound.js
@@ -23,7 +23,7 @@ Sound = {
     var options = Object.extend({
       track: 'global', url: url, replace: false
     }, arguments[1] || {});
-    
+
     if(options.replace && this.tracks[options.track]) {
       $R(0, this.tracks[options.track].id).each(function(id){
         var sound = $('sound_'+options.track+'_'+id);
@@ -32,14 +32,14 @@ Sound = {
       })
       this.tracks[options.track] = null;
     }
-      
+
     if(!this.tracks[options.track])
       this.tracks[options.track] = { id: 0 }
     else
       this.tracks[options.track].id++;
-      
+
     options.id = this.tracks[options.track].id;
-    $$('body')[0].insert( 
+    $$('body')[0].insert(
       Prototype.Browser.IE ? new Element('bgsound',{
         id: 'sound_'+options.track+'_'+options.id,
         src: options.url, loop: 1, autostart: true
diff --git a/public/javascripts/pebbles/unittest.js b/public/javascripts/pebbles/unittest.js
index 13473a3..91d9776 100644
--- a/public/javascripts/pebbles/unittest.js
+++ b/public/javascripts/pebbles/unittest.js
@@ -19,10 +19,10 @@ Event.simulateMouse = function(element, eventName) {
     metaKey:  false
   }, arguments[2] || {});
   var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView,
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY,
     options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
-  
+
   if(this.mark) Element.remove(this.mark);
   this.mark = document.createElement('div');
   this.mark.appendChild(document.createTextNode(" "));
@@ -34,10 +34,10 @@ Event.simulateMouse = function(element, eventName) {
   this.mark.style.height = "5px;";
   this.mark.style.borderTop = "1px solid red;"
   this.mark.style.borderLeft = "1px solid red;"
-  
+
   if(this.step)
     alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
+
   $(element).dispatchEvent(oEvent);
 };
 
@@ -55,7 +55,7 @@ Event.simulateKey = function(element, eventName) {
   }, arguments[2] || {});
 
   var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
+  oEvent.initKeyEvent(eventName, true, true, window,
     options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
     options.keyCode, options.charCode );
   $(element).dispatchEvent(oEvent);
@@ -123,7 +123,7 @@ Test.Unit.Logger.prototype = {
   _toHTML: function(txt) {
     return txt.escapeHTML().replace(/\n/g,"<br/>");
   },
-  addLinksToResults: function(){ 
+  addLinksToResults: function(){
     $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
       td.title = "Run only this test"
       Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
@@ -162,7 +162,7 @@ Test.Unit.Runner.prototype = {
           if(/^test/.test(testcase)) {
             this.tests.push(
                new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase,
                  testcases[testcase], testcases["setup"], testcases["teardown"]
                ));
           }
@@ -203,7 +203,7 @@ Test.Unit.Runner.prototype = {
   },
   postResults: function() {
     if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
+      new Ajax.Request(this.options.resultsURL,
         { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
     }
   },
@@ -240,9 +240,9 @@ Test.Unit.Runner.prototype = {
       errors     +=   this.tests[i].errors;
     }
     return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
+      (this.options.context ? this.options.context + ': ': '') +
+      this.tests.length + " tests, " +
+      assertions + " assertions, " +
       failures   + " failures, " +
       errors     + " errors");
   }
@@ -258,7 +258,7 @@ Test.Unit.Assertions.prototype = {
   },
   summary: function() {
     return (
-      this.assertions + " assertions, " + 
+      this.assertions + " assertions, " +
       this.failures   + " failures, " +
       this.errors     + " errors" + "\n" +
       this.messages.join("\n"));
@@ -284,55 +284,55 @@ Test.Unit.Assertions.prototype = {
   },
   assert: function(expression) {
     var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
+    try { expression ? this.pass() :
       this.fail(message); }
     catch(e) { this.error(e); }
   },
   assertEqual: function(expected, actual) {
     var message = arguments[2] || "assertEqual";
     try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
   assertInspect: function(expected, actual) {
     var message = arguments[2] || "assertInspect";
     try { (expected == actual.inspect()) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
   assertEnumEqual: function(expected, actual) {
     var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
+    try { $A(expected).length == $A(actual).length &&
       expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) +
           ', actual ' + Test.Unit.inspect(actual)); }
     catch(e) { this.error(e); }
   },
   assertNotEqual: function(expected, actual) {
     var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
+    try { (expected != actual) ? this.pass() :
       this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
     catch(e) { this.error(e); }
   },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
+  assertIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertIdentical";
+    try { (expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
   },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
+  assertNotIdentical: function(expected, actual) {
+    var message = arguments[2] || "assertNotIdentical";
+    try { !(expected === actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
   },
   assertNull: function(obj) {
     var message = arguments[1] || 'assertNull'
-    try { (obj==null) ? this.pass() : 
+    try { (obj==null) ? this.pass() :
       this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
     catch(e) { this.error(e); }
   },
@@ -353,38 +353,38 @@ Test.Unit.Assertions.prototype = {
   },
   assertType: function(expected, actual) {
     var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+    try {
+      (actual.constructor == expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + (actual.constructor) + '"'); }
     catch(e) { this.error(e); }
   },
   assertNotOfType: function(expected, actual) {
     var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+    try {
+      (actual.constructor != expected) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +
         '", actual "' + (actual.constructor) + '"'); }
     catch(e) { this.error(e); }
   },
   assertInstanceOf: function(expected, actual) {
     var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
+    try {
+      (actual instanceof expected) ? this.pass() :
       this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
+    catch(e) { this.error(e); }
   },
   assertNotInstanceOf: function(expected, actual) {
     var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
+    try {
+      !(actual instanceof expected) ? this.pass() :
       this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
+    catch(e) { this.error(e); }
   },
   assertRespondsTo: function(method, obj) {
     var message = arguments[2] || 'assertRespondsTo';
     try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() :
       this.fail(message + ": object doesn't respond to [" + method + "]"); }
     catch(e) { this.error(e); }
   },
@@ -393,7 +393,7 @@ Test.Unit.Assertions.prototype = {
     try {
       var m = obj[method];
       if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
+      m() ? this.pass() :
       this.fail(message + ": method returned false"); }
     catch(e) { this.error(e); }
   },
@@ -402,17 +402,17 @@ Test.Unit.Assertions.prototype = {
     try {
       var m = obj[method];
       if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
+      !m() ? this.pass() :
       this.fail(message + ": method returned true"); }
     catch(e) { this.error(e); }
   },
   assertRaise: function(exceptionName, method) {
     var message = arguments[2] || 'assertRaise';
-    try { 
+    try {
       method();
       this.fail(message + ": exception expected but none was raised"); }
     catch(e) {
-      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e);
     }
   },
   assertElementsMatch: function() {
@@ -434,7 +434,7 @@ Test.Unit.Assertions.prototype = {
     var startAt = new Date();
     (iterations || 1).times(operation);
     var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
+    this.info((arguments[2] || 'Operation') + ' finished ' +
        iterations + ' iterations in ' + (timeTaken/1000)+'s' );
     return timeTaken;
   },
@@ -444,7 +444,7 @@ Test.Unit.Assertions.prototype = {
     this.assertNotNull(element);
     if(element.style && Element.getStyle(element, 'display') == 'none')
       return false;
-    
+
     return this._isVisible(element.parentNode);
   },
   assertNotVisible: function(element) {
@@ -457,7 +457,7 @@ Test.Unit.Assertions.prototype = {
     var startAt = new Date();
     (iterations || 1).times(operation);
     var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
+    this.info((arguments[2] || 'Operation') + ' finished ' +
        iterations + ' iterations in ' + (timeTaken/1000)+'s' );
     return timeTaken;
   }
@@ -468,7 +468,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p
   initialize: function(name, test, setup, teardown) {
     Test.Unit.Assertions.prototype.initialize.bind(this)();
     this.name           = name;
-    
+
     if(typeof test == 'string') {
       test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
       test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
@@ -478,7 +478,7 @@ Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.p
     } else {
       this.test = test || function() {};
     }
-    
+
     this.setup          = setup || function() {};
     this.teardown       = teardown || function() {};
     this.isWaiting      = false;
@@ -519,23 +519,23 @@ Test.setupBDDExtensionMethods = function(){
     shouldNotBeAn:   'assertNotOfType',
     shouldBeNull:    'assertNull',
     shouldNotBeNull: 'assertNotNull',
-    
+
     shouldBe:        'assertReturnsTrue',
     shouldNotBe:     'assertReturnsFalse',
     shouldRespondTo: 'assertRespondsTo'
   };
-  var makeAssertion = function(assertion, args, object) { 
+  var makeAssertion = function(assertion, args, object) {
    	this[assertion].apply(this,(args || []).concat([object]));
   }
-  
-  Test.BDDMethods = {};   
-  $H(METHODMAP).each(function(pair) { 
-    Test.BDDMethods[pair.key] = function() { 
-       var args = $A(arguments); 
-       var scope = args.shift(); 
-       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+
+  Test.BDDMethods = {};
+  $H(METHODMAP).each(function(pair) {
+    Test.BDDMethods[pair.key] = function() {
+       var args = $A(arguments);
+       var scope = args.shift();
+       makeAssertion.apply(scope, [pair.value, args, this]); };
   });
-  
+
   [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
     function(p){ Object.extend(p, Test.BDDMethods) }
   );
@@ -543,7 +543,7 @@ Test.setupBDDExtensionMethods = function(){
 
 Test.context = function(name, spec, log){
   Test.setupBDDExtensionMethods();
-  
+
   var compiledSpec = {};
   var titles = {};
   for(specName in spec) {
@@ -557,7 +557,7 @@ Test.context = function(name, spec, log){
         var body = spec[specName].toString().split('\n').slice(1);
         if(/^\{/.test(body[0])) body = body.slice(1);
         body.pop();
-        body = body.map(function(statement){ 
+        body = body.map(function(statement){
           return statement.strip()
         });
         compiledSpec[testName] = body.join('\n');
diff --git a/public/javascripts/pebbles/wms-gs.js b/public/javascripts/pebbles/wms-gs.js
index c67146b..087e694 100644
--- a/public/javascripts/pebbles/wms-gs.js
+++ b/public/javascripts/pebbles/wms-gs.js
@@ -19,8 +19,8 @@ var WGS84_ECCENTRICITY = 0.0818191913108718138;
 var DEG2RAD=0.0174532922519943;
 var PI=3.14159267;
 
-function dd2MercMetersLng(p_lng) { 
-	return WGS84_SEMI_MAJOR_AXIS * (p_lng*DEG2RAD); 
+function dd2MercMetersLng(p_lng) {
+	return WGS84_SEMI_MAJOR_AXIS * (p_lng*DEG2RAD);
 }
 
 function dd2MercMetersLat(p_lat) {
@@ -43,7 +43,7 @@ getTileUrlForWMS=function(a,b,c) {
 	var lLRP = new GPoint((a.x+1)*256,a.y*256);
 	var lUL = G_NORMAL_MAP.getProjection().fromPixelToLatLng(lULP,b,c);
 	var lLR = G_NORMAL_MAP.getProjection().fromPixelToLatLng(lLRP,b,c);
-	 
+
 	if (this.useGeographic){
            var lBbox=lUL.x+","+lUL.y+","+lLR.x+","+lLR.y;
     	   var lSRS="EPSG:4326";
@@ -56,7 +56,7 @@ getTileUrlForWMS=function(a,b,c) {
 	lURL+="&SERVICE=WMS";
 	lURL+="&VERSION=1.1.1";
 	lURL+="&LAYERS="+this.layers;
-	lURL+="&STYLES="+this.styles; 
+	lURL+="&STYLES="+this.styles;
 	lURL+="&FORMAT=image/"+this.format;
 	lURL+="&BGCOLOR=0xFFFFFF";
 	lURL+="&TRANSPARENT=TRUE";
diff --git a/public/javascripts/pebbles/ym4r-gm.js b/public/javascripts/pebbles/ym4r-gm.js
index 0b433b5..adb2bc6 100644
--- a/public/javascripts/pebbles/ym4r-gm.js
+++ b/public/javascripts/pebbles/ym4r-gm.js
@@ -61,9 +61,9 @@ GMap2.prototype.centerAndZoomOnMarkers = function(markers) {
      for (var i=1, len = markers.length ; i<len; i++) {
 	 bounds.extend(markers[i].getPoint());
      }
-     
+
      this.centerAndZoomOnBounds(bounds);
- } 
+ }
 
 GMap2.prototype.centerAndZoomOnPoints = function(points) {
      var bounds = new GLatLngBounds(points[0],
@@ -71,14 +71,14 @@ GMap2.prototype.centerAndZoomOnPoints = function(points) {
      for (var i=1, len = points.length ; i<len; i++) {
 	 bounds.extend(points[i]);
      }
-     
+
      this.centerAndZoomOnBounds(bounds);
- } 
+ }
 
 GMap2.prototype.centerAndZoomOnBounds = function(bounds) {
     var center = bounds.getCenter();
     this.setCenter(center, this.getBoundsZoomLevel(bounds));
-} 
+}
 
 //For full screen mode
 function setWindowDims(elem) {
diff --git a/public/javascripts/views/admin/categories/edit.js b/public/javascripts/views/admin/categories/edit.js
index fd31d11..955e369 100644
--- a/public/javascripts/views/admin/categories/edit.js
+++ b/public/javascripts/views/admin/categories/edit.js
@@ -1,11 +1,11 @@
 jQuery(document).ready(function() {
 
-  var category_image_options = { 
-    target: "#image_list" 
+  var category_image_options = {
+    target: "#image_list"
   }
-  jQuery('#category_image_add').livequery('submit', function() { 
-    jQuery(this).ajaxSubmit(category_image_options); 
-    return false; 
+  jQuery('#category_image_add').livequery('submit', function() {
+    jQuery(this).ajaxSubmit(category_image_options);
+    return false;
   });
 
   jQuery(".destroy-category-image").live("click", function() {
@@ -14,10 +14,10 @@ jQuery(document).ready(function() {
     }
     return false;
   })
-  
-  jQuery('#category_icon_add').livequery('submit', function() { 
-    jQuery(this).ajaxSubmit({ target: "#category_icon"}); 
-    return false; 
+
+  jQuery('#category_icon_add').livequery('submit', function() {
+    jQuery(this).ajaxSubmit({ target: "#category_icon"});
+    return false;
   });
 
   jQuery(".destroy-category-icon").live("click", function() {
@@ -26,10 +26,10 @@ jQuery(document).ready(function() {
     }
     return false;
   })
-  
-  jQuery('#category_icon_hover_add').livequery('submit',function() { 
-    jQuery(this).ajaxSubmit({ target: "#icon_hover"}); 
-    return false; 
+
+  jQuery('#category_icon_hover_add').livequery('submit',function() {
+    jQuery(this).ajaxSubmit({ target: "#icon_hover"});
+    return false;
   });
 
   jQuery("#destroy-category-icon-hover").live("click", function() {
diff --git a/public/javascripts/views/admin/categories/index.js b/public/javascripts/views/admin/categories/index.js
index 9be079b..e12154d 100644
--- a/public/javascripts/views/admin/categories/index.js
+++ b/public/javascripts/views/admin/categories/index.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
-  $('#category-list').sortable({ 
-    items: 'li', 
+  $('#category-list').sortable({
+    items: 'li',
     placeholder: 'ui-state-highlight',
     forcePlaceholderSize: 'true',
     update: function(event, ui) {
@@ -9,7 +9,7 @@ $(document).ready(function() {
         {
           _method: 'PUT',
           parent: $(ui.item).parent().attr('id'),
-          right: $(ui.item).next().attr('id') 
+          right: $(ui.item).next().attr('id')
         }
       );
     }
diff --git a/public/javascripts/views/admin/orders/show.js b/public/javascripts/views/admin/orders/show.js
index 6f05c97..0417751 100644
--- a/public/javascripts/views/admin/orders/show.js
+++ b/public/javascripts/views/admin/orders/show.js
@@ -1,9 +1,9 @@
-(function($) { 
+(function($) {
   $(document).ready(function(){
       $('#post_authorize_link').click(function() {
           var order_total = $('#post_authorize_amount').val();
-          $('#order_transactions').load($(this).attr('href'), { _method: 'put', post_authorize_amount: order_total}, 
-                                        $(this).hide()); 
+          $('#order_transactions').load($(this).attr('href'), { _method: 'put', post_authorize_amount: order_total},
+                                        $(this).hide());
           return false;
       });
     $('#print-packing-sheet').click( function() {
diff --git a/public/javascripts/views/carts/show.js b/public/javascripts/views/carts/show.js
index 8b843b7..2c1b420 100644
--- a/public/javascripts/views/carts/show.js
+++ b/public/javascripts/views/carts/show.js
@@ -1,18 +1,18 @@
-(function($) { 
+(function($) {
   $.postJSON = function(url, data, callback) {
     $.post( url, data, callback, "json") ;
-  };  
+  };
 
   $(document).ready(function(){
     $('#regions').change( function() {
       $(this).spin();
       $('#shipping_info').load("/regions/" + $('#regions').val() + "/shipping_methods",
-                               function() { $('.spinner').hide(); }); 
+                               function() { $('.spinner').hide(); });
     });
     $('#methods').livequery('change', function() {
       $(this).spin();
       $.postJSON("/regions/" + $('#regions').val() + "/shipping_methods/" + $(this).val(),
-                 { _method: "PUT"}, 
+                 { _method: "PUT"},
                  function(json){
                    $('#shipping_total').html(json.shipping_total);
                    $('#cart_total').html(json.grand_total);
@@ -26,7 +26,7 @@
       min: 1
     });
     $('#cart_form').validate();
-    
+
   });
 
 })(jQuery);
\ No newline at end of file
diff --git a/public/javascripts/views/orders/new-create.js b/public/javascripts/views/orders/new-create.js
index fd0bc10..a70f446 100644
--- a/public/javascripts/views/orders/new-create.js
+++ b/public/javascripts/views/orders/new-create.js
@@ -5,7 +5,7 @@ function ShowHideShipping() {
     $("#shipping_address_fields").hide();
   }
 }
-(function($) { 
+(function($) {
   $.postJSON = function(url, data, callback) {
     $.post( url, data, callback, "json") ;
   };
@@ -26,7 +26,7 @@ function ShowHideShipping() {
            if (ccMonth < intMonth && ccYear == intYear ) { result = false; }
            return result;
       }, "Card has already expired");
-  
+
   $(document).ready(function(){
     $('#order_form').validate({
       invalidHandler: function() {
@@ -38,13 +38,13 @@ function ShowHideShipping() {
         },
         'shipping_address[city]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },   
+        },
         'shipping_address[state]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },     
+        },
         'shipping_address[state]': {
           required: function (element) { return $('#address_choice:checked').length == 0 }
-        },     
+        },
         'shipping_address[postal_code]': {
           zipcode: {depends: function (element) { return $('#address_choice:checked').length == 0 }}
         },
@@ -53,7 +53,7 @@ function ShowHideShipping() {
         }
       }
     });
-    if ($('#order_card_type').length == 0) { 
+    if ($('#order_card_type').length == 0) {
       $('#credit_card_number').rules("remove", "creditcard2");
     }
     $('#promo_code_link').click(function() {
@@ -63,7 +63,7 @@ function ShowHideShipping() {
         function(json) {
           $('#promo_code_message').html(json.promo_code_message).effect("highlight", {}, 3000);
           $('#promo_code_note').html(json.promo_code_note).effect("highlight", {}, 3000);
-          
+
           $('#shipping_total').html(json.shipping_total);
           $('#cart_total').html(json.grand_total);
           if (json.no_discount) {
@@ -87,12 +87,12 @@ function ShowHideShipping() {
           return false;
       });
 
-    
+
     $('#billing_address_state').change(function() {
       var billing_state = $(this).val();
       $.postJSON(
         "../taxes/1",
-        { billing_state: billing_state, _method: "PUT"}, 
+        { billing_state: billing_state, _method: "PUT"},
         function(json){
           if (json.no_tax) {
             $('#tax_row').hide();
@@ -110,7 +110,7 @@ function ShowHideShipping() {
   $('#methods').livequery('change', function() {
       $(this).spin();
       $.postJSON("../regions/1/shipping_methods/" + $(this).val(),
-                 { _method: "PUT"}, 
+                 { _method: "PUT"},
                  function(json){
                    $('#shipping_total').html(json.shipping_total);
                    $('#cart_total').html(json.grand_total);
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 1f65064..2cb3d02 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -5,8 +5,8 @@ html,body {
 }
 
 body {
-	font-family: "Myriad Pro", "Myriad Web", "Lucida Grande", 
-				 "Trebuchet MS",  Tahoma, Helvetica, Arial, 
+	font-family: "Myriad Pro", "Myriad Web", "Lucida Grande",
+				 "Trebuchet MS",  Tahoma, Helvetica, Arial,
 				sans-serif;
 	font-size: small;
 	position: relative;
@@ -73,7 +73,7 @@ ol, ul {
 
 		#utilty-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#main-navigation li {
@@ -114,7 +114,7 @@ ol, ul {
 	   border-right: 3px #fff solid;
 	   border-bottom: none;
 	}
-		
+
 /* utility navigation */
 
 #utility-navigation {
@@ -133,7 +133,7 @@ ol, ul {
 
 		#utility-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#utility-navigation li {
@@ -141,7 +141,7 @@ ol, ul {
 		margin: 0px;
 		padding: 9px 19px;
 	}
-	
+
 /* auxilary navigation */
 
 #auxilary-navigation {
@@ -158,7 +158,7 @@ ol, ul {
 
 		#auxilary-navigation a:hover {
 			text-decoration: underline;
-	
+
 		}
 
 	#auxilary-navigation li {
@@ -168,8 +168,8 @@ ol, ul {
 	}
 
 /* footer bar */
-#footer-navigation { 
-    color: #666; 
+#footer-navigation {
+    color: #666;
 	background: #eeeee1;
 	clear: both;
 	font-size:  90%;
@@ -179,10 +179,10 @@ ol, ul {
 	padding: 3px;
 }
 
-	#footer-navigation ul { 
+	#footer-navigation ul {
 		margin: 0;
 		padding: 0;
-		text-align: left; 
+		text-align: left;
 		clear:  both;
 	}
 
@@ -195,7 +195,7 @@ ol, ul {
 
 	#footer-navigation a {
 		color: #666;
-		text-decoration: none; 
+		text-decoration: none;
 	}
 
 	#footer-navigation a:hover {
@@ -222,7 +222,7 @@ ol, ul {
 /* banner */
 
 #banner {
-	float: left;	
+	float: left;
 }
 
 /* search */
@@ -279,9 +279,9 @@ ol, ul {
 	border-bottom: solid 1px #C5DBF7;
 	border-left: solid 1px #C5DBF7;
  }
- 
+
 .listing-table td.subcat {
-	margin-left: 20px;	
+	margin-left: 20px;
 }
 
 .listing-table td.actions {
@@ -297,7 +297,7 @@ ol, ul {
  	background-color:#fff;
  	border: solid 0px #ddd;
 }
- 
+
 .listing-table tr td.sorted {
  	background-color: #B9DCFF;
  	border-bottom: solid 1px #AFD0F5;
@@ -369,9 +369,9 @@ ol, ul {
  	background: #333 url(../images/indicator-small.gif) right 50% no-repeat;
 }
 
- 
+
  /* Product Options */
- 
+
 #selection-list {
 	border-style: dotted;
 	border-color: #ccc;
@@ -421,7 +421,7 @@ ol, ul {
 
 
  /* Project Seven Tabs */
- 
+
 .p7TPwrapper {
 	padding: 8px 0px 7px 0px;
 }
@@ -447,7 +447,7 @@ ol, ul {
 	font-size: 1.1em;
 }
 #p7TP1 .p7TP_tabs a, #p7TP2 .p7TP_tabs a,
-#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a, 
+#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a,
 #p7TP5 .p7TP_tabs a {
 	padding: 8px 8px 4px 6px;
 	display: block;
@@ -465,11 +465,11 @@ ol, ul {
 	outline: 1px dotted;
 	outline-color: #ffffff;
 }
-#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover, 
-#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover, 
-#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active, 
+#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover,
+#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover,
+#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active,
 #p7TP2 .p7TP_tabs a:active, #p7TP3 .p7TP_tabs a:active,
-#p7TP4 .p7TP_tabs a:active, 
+#p7TP4 .p7TP_tabs a:active,
 #p7TP5 .p7TP_tabs a:active {
 		background-color: transparent;
 }
@@ -499,7 +499,7 @@ ol, ul {
 	border: 1px solid #CCCCCC;
 
 }
-.p7TPcontent h2, .p7TPcontent h3, 
+.p7TPcontent h2, .p7TPcontent h3,
 .p7TPcontent h4 {
 	font-size: 1.1em;
 	color: #444444;
@@ -509,8 +509,8 @@ ol, ul {
 .p7TPcontent p {
 	margin: 6px 0 12px 0;
 }
-#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down, 
-#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down, 
+#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down,
+#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down,
 #p7TP5 .p7TP_tabs div.down {
 	padding: 0;
 	position: relative;
@@ -518,8 +518,8 @@ ol, ul {
 	background-image: url(p7tp/tabs01_down.gif);
 	background-repeat: no-repeat;
 }
-#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a, 
-#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a, 
+#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a,
+#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a,
 #p7TP5 .p7TP_tabs div.down a {
 	background-image: url(p7tp/tabs01_down2.gif);
 	background-repeat: no-repeat;
@@ -529,4 +529,3 @@ ol, ul {
 .p7TP_tabs {
 	display: none;
 }
- 
\ No newline at end of file
diff --git a/public/stylesheets/lightbox.css b/public/stylesheets/lightbox.css
index 3678502..00104d0 100644
--- a/public/stylesheets/lightbox.css
+++ b/public/stylesheets/lightbox.css
@@ -5,11 +5,11 @@
 	border-bottom: 2px solid #666;
 	border-right: 2px solid #666;
 }
-	
+
 #lightboxDetails {
 	font-size: 0.8em;
 	padding-top: 0.4em;
-}	
+}
 
 #lightboxCaption { float: left; }
 
@@ -17,7 +17,7 @@
 
 #closeButton { top: 5px; right: 5px; }
 
-#lightbox img { border: none; clear: both;} 
+#lightbox img { border: none; clear: both;}
 
 #overlay img { border: none; }
 
diff --git a/public/stylesheets/p7tp.css b/public/stylesheets/p7tp.css
index 164f8c1..b22b8c5 100644
--- a/public/stylesheets/p7tp.css
+++ b/public/stylesheets/p7tp.css
@@ -1,5 +1,5 @@
  /* Project Seven Tabs */
- 
+
 .p7TPwrapper {
 	padding: 8px 0px 7px 0px;
 }
@@ -25,7 +25,7 @@
 	font-size: 1.1em;
 }
 #p7TP1 .p7TP_tabs a, #p7TP2 .p7TP_tabs a,
-#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a, 
+#p7TP3 .p7TP_tabs a, #p7TP4 .p7TP_tabs a,
 #p7TP5 .p7TP_tabs a {
 	padding: 8px 8px 4px 6px;
 	display: block;
@@ -43,11 +43,11 @@
 	outline: 1px dotted;
 	outline-color: #ffffff;
 }
-#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover, 
-#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover, 
-#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active, 
+#p7TP1 .p7TP_tabs a:hover, #p7TP2 .p7TP_tabs a:hover,
+#p7TP3 .p7TP_tabs a:hover, #p7TP4 .p7TP_tabs a:hover,
+#p7TP5 .p7TP_tabs a:hover, #p7TP1 .p7TP_tabs a:active,
 #p7TP2 .p7TP_tabs a:active, #p7TP3 .p7TP_tabs a:active,
-#p7TP4 .p7TP_tabs a:active, 
+#p7TP4 .p7TP_tabs a:active,
 #p7TP5 .p7TP_tabs a:active {
 		background-color: transparent;
 }
@@ -77,7 +77,7 @@
 	border: 1px solid #CCCCCC;
 
 }
-.p7TPcontent h2, .p7TPcontent h3, 
+.p7TPcontent h2, .p7TPcontent h3,
 .p7TPcontent h4 {
 	font-size: 1.1em;
 	color: #444444;
@@ -87,8 +87,8 @@
 .p7TPcontent p {
 	margin: 6px 0 12px 0;
 }
-#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down, 
-#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down, 
+#p7TP1 .p7TP_tabs div.down, #p7TP2 .p7TP_tabs div.down,
+#p7TP3 .p7TP_tabs div.down, #p7TP4 .p7TP_tabs div.down,
 #p7TP5 .p7TP_tabs div.down {
 	padding: 0;
 	position: relative;
@@ -96,8 +96,8 @@
 	background-image: url(p7tp/tabs01_down.gif);
 	background-repeat: no-repeat;
 }
-#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a, 
-#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a, 
+#p7TP1 .p7TP_tabs div.down a, #p7TP2 .p7TP_tabs div.down a,
+#p7TP3 .p7TP_tabs div.down a, #p7TP4 .p7TP_tabs div.down a,
 #p7TP5 .p7TP_tabs div.down a {
 	background-image: url(p7tp/tabs01_down2.gif);
 	background-repeat: no-repeat;
diff --git a/spec/cart_builder.rb b/spec/cart_builder.rb
index 116b752..d4a4f6d 100644
--- a/spec/cart_builder.rb
+++ b/spec/cart_builder.rb
@@ -3,7 +3,7 @@ def build_variant_cart
     @product = Factory(:product)
     @variant_product = Factory(:product)
     size = Factory(:product_option)
-    color = Factory(:product_option, :name => 'color') 
+    color = Factory(:product_option, :name => 'color')
     @large = Factory(:product_option_selection, :name => 'large', :product_option => size)
     @small = Factory(:product_option_selection, :name => 'small', :product_option => size)
     @red = Factory(:product_option_selection, :name => 'red', :product_option => color)
@@ -11,17 +11,17 @@ def build_variant_cart
     @variant_product.product_options << [size, color]
     @cart = Cart.create(:name => 'test')
   end
-  
+
   def build_variant_order_item
     @cart.add_product(@variant_product.id, 1, [@large.id, @red.id])
     @order_item = OrderItem.from_cart_item(@cart.cart_items.find_by_product_id(@variant_product.id))
-  end 
-  
+  end
+
   def build_regular_order_item
     @cart.add_product(@product.id, 1, nil)
     @order_item = OrderItem.from_cart_item(@cart.cart_items.find_by_product_id(@product.id))
   end
-   
+
   def build_order
     @order = Order.new
     build_variant_order_item
@@ -29,6 +29,6 @@ def build_order
     build_regular_order_item
     @order.order_items << @order_item
   end
-    
-    
+
+
 end
\ No newline at end of file
diff --git a/spec/factories/order.rb b/spec/factories/order.rb
index 2cd2eae..44b418c 100644
--- a/spec/factories/order.rb
+++ b/spec/factories/order.rb
@@ -1,7 +1,7 @@
 Factory.define :order do |f|
   f.full_name    "testing tester"
   f.email        "test@test.com"
-  f.order_type   0 
+  f.order_type   0
   f.phone_number "123-4567"
   f.business     "test inc."
 end
diff --git a/spec/factories/product.rb b/spec/factories/product.rb
index 76bf36e..21288b3 100644
--- a/spec/factories/product.rb
+++ b/spec/factories/product.rb
@@ -3,7 +3,7 @@
 end
 
 Factory.define :product do |f|
-  f.sku                 { Factory.next(:sku) } 
+  f.sku                 { Factory.next(:sku) }
   f.name               'product1'
   f.description        'description for product 1'
   f.weight             1
diff --git a/spec/factories/tax_rate.rb b/spec/factories/tax_rate.rb
index 73727bd..21287d8 100644
--- a/spec/factories/tax_rate.rb
+++ b/spec/factories/tax_rate.rb
@@ -1,5 +1,4 @@
-Factory.define :tax_rate do |t| 
+Factory.define :tax_rate do |t|
   t.state     'VA'
   t.rate      0.05
 end
-  
\ No newline at end of file
diff --git a/spec/lib/inventory_spec.rb b/spec/lib/inventory_spec.rb
index 530cf18..c535afb 100644
--- a/spec/lib/inventory_spec.rb
+++ b/spec/lib/inventory_spec.rb
@@ -6,7 +6,7 @@
 include ActiveMerchant::Billing
 
 describe "Inventory" do
-  before(:each) do 
+  before(:each) do
     configuration = GeneralConfiguration.instance
     configuration.inventory_management = true
     configuration.save!
@@ -16,7 +16,7 @@
     @variant = @variant_product.find_variant_by_selection_ids([@large.id, @red.id])
     @variant.update_attributes!(:inventory => 10)
   end
-  
+
   describe "#validate_cart" do
     context "valid cart" do
       before(:each) do
@@ -27,27 +27,27 @@
         @cart.errors.size.should == 0
       end
     end
-    
+
     context "invalid cart" do
       before(:each) do
         @variant.update_attributes!(:inventory => 0)
         Inventory.new.validate_cart(@cart)
       end
-      
+
       it "should invalidate a cart with items that are beyond the inventory availability" do
         @cart.errors.size.should_not == 0
       end
     end
   end
-  
+
   describe "#decrease_order_inventory" do
-    before(:each) do 
+    before(:each) do
       @address = Factory(:address)
       @order = Factory.build(:order)
       @options = Hash.new
       @options[:billing_address] = @address.attributes
-      @options[:credit_card] = {:first_name => "testing", :last_name => "tester", 
-                                :number => "4012888818888", :month => "12", :year => "2011", 
+      @options[:credit_card] = {:first_name => "testing", :last_name => "tester",
+                                :number => "4012888818888", :month => "12", :year => "2011",
                                 :verification_value => "234" }
       @options[:order] = @order.attributes
       @options[:address_choice] = true
diff --git a/spec/lib/order_calculations_spec.rb b/spec/lib/order_calculations_spec.rb
index 32de489..2bdac8e 100644
--- a/spec/lib/order_calculations_spec.rb
+++ b/spec/lib/order_calculations_spec.rb
@@ -13,7 +13,7 @@
       build_variant_cart
       build_order
     end
-    
+
     it "should add the total of the order_items prices" do
       @order.sub_total.should == 13.00
     end
@@ -22,7 +22,7 @@
       @order.promo_discount = 1.00
       @order.sub_total.should == 12.00
     end
-    
+
   end
 
   describe "Tax Calculations" do
@@ -56,13 +56,13 @@
     before(:each) do
       rate = Factory(:tax_rate)
       @address = Factory(:address)
-      @order = Order.new(:product_cost => 39.90, :shipping_cost => 6.45, 
+      @order = Order.new(:product_cost => 39.90, :shipping_cost => 6.45,
                           :billing_address => @address)
       @order.stub!(:product_total).and_return(39.90)
       @order.tax = @order.calculate_tax
     end
 
-    context "person lives in state with tax rate" do 
+    context "person lives in state with tax rate" do
 
       it "should round taxrate to match ActiveMerchant" do
         number_to_currency(@order.total)[1,5].should == sprintf("%.2f", 4834.5.to_f / 100)
@@ -78,7 +78,7 @@
       end
 
     end
-    
+
     context "person lives in state without tax rate" do
       before(:each) do
         @address.state = "CO"
@@ -87,8 +87,8 @@
       it "should not charge tax" do
         @order.calculate_tax.should == 0
       end
-      
+
     end
   end
-  
+
 end
diff --git a/spec/lib/order_factory_spec.rb b/spec/lib/order_factory_spec.rb
index c6cd36c..e6cc8b3 100644
--- a/spec/lib/order_factory_spec.rb
+++ b/spec/lib/order_factory_spec.rb
@@ -8,7 +8,7 @@
 
 describe "OrderFactory" do
   describe "#create_web_order" do
-    before(:each) do 
+    before(:each) do
       build_variant_cart
       @cart.add_product(@variant_product.id, 1, [@large.id, @red.id])
       @cart.add_product(@product.id, 1, nil)
@@ -16,8 +16,8 @@
       @order = Factory.build(:order)
       @options = Hash.new
       @options[:billing_address] = @address.attributes
-      @options[:credit_card] = {:first_name => "testing", :last_name => "tester", 
-                                :number => "1", :month => "12", :year => "2011", 
+      @options[:credit_card] = {:first_name => "testing", :last_name => "tester",
+                                :number => "1", :month => "12", :year => "2011",
                                 :verification_value => "234" }
       @options[:order] = @order.attributes
       @options[:address_choice] = true
@@ -28,21 +28,21 @@
       order = OrderFactory.create_web_order(@cart, @options)
       order.order_items.size.should == 2
     end
-    
-    it "should not apply free shipping when order is less than minimum amount" do 
+
+    it "should not apply free shipping when order is less than minimum amount" do
       promo_code = Factory(:promo_code, :free_shipping => true, :minimum_order_amount => 100.0)
       @options[:order].merge!({:promo_code => promo_code.code})
       order = OrderFactory.create_web_order(@cart, @options)
       order.free_shipping.should == false
       order.shipping_cost.should_not == 0.to_f
     end
-      
+
     it "should apply free shipping when order is greater than minimum amount" do
       promo_code = Factory(:promo_code, :free_shipping => true, :minimum_order_amount => 3.0)
       @options[:order].merge!({:promo_code => promo_code.code})
       order = OrderFactory.create_web_order(@cart, @options)
       order.free_shipping.should == true
-      order.shipping_cost.should == 0.to_f      
+      order.shipping_cost.should == 0.to_f
     end
   end
 end
diff --git a/spec/lib/shipping_calculations_spec.rb b/spec/lib/shipping_calculations_spec.rb
index 6980e75..6b2fe26 100644
--- a/spec/lib/shipping_calculations_spec.rb
+++ b/spec/lib/shipping_calculations_spec.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../pebbles_factory'
 
-describe ShippingCalculations do 
+describe ShippingCalculations do
 
   describe "#weight_total" do
     context "for cart" do
@@ -42,7 +42,7 @@
     end
   end
 
-  # before(:each) do 
+  # before(:each) do
   #    #ShippingCalculations.stub!(:quote_packages).and_return(5)
   #    Factory(:configuration)
   #    @cart = Cart.new
@@ -57,42 +57,42 @@
   #    CartItem.add_product(@cart, @product2.id, 1, nil)
   #    @cart.save
   #  end
-  #  
+  #
   #  it "should calculate free shipping for a product" do
   #    @vendor.shipping_type = ShippingType::FREE_SHIPPING
   #    @vendor.save
   #    quote = ShippingCalculations.product_quote(@product1.id, 1, '24091')
   #    quote.should == 0
   #  end
-  #   
+  #
   #  it "should calculate flat-rate shipping for a product" do
   #    @vendor.shipping_type = ShippingType::FLAT_RATE_SHIPPING
   #    @vendor.save
   #    quote = ShippingCalculations.product_quote(@product1.id, 1, '24091')
   #    quote.should == 1
-  #  end 
-  # 
+  #  end
+  #
   #  it "should calculate real-time shipping for a product" do
   #    @vendor.shipping_type = ShippingType::REAL_TIME_SHIPPING
   #    @vendor.save
   #    quote = ShippingCalculations.product_quote(@product1.id, 1, '24091')
   #    quote.should_not == 0 || 1
   #    quote_with_accessory = ShippingCalculations.product_quote(@product1.id, 1, '24091',[ @product2 ])
-  #    quote_with_accessory.should == quote * 2 
-  #  end 
-  #    
+  #    quote_with_accessory.should == quote * 2
+  #  end
+  #
   #  it "should calculate free shipping for a cart" do
   #    @vendor.shipping_type = ShippingType::FREE_SHIPPING
   #    @vendor.save
   #    @cart.shipping_totals(nil, nil, nil).should == 0
   #  end
-  #  
+  #
   #  it "should calculate flat-rate shipping for a cart" do
   #    @vendor.shipping_type = ShippingType::FLAT_RATE_SHIPPING
   #    @vendor.save
   #    @cart.shipping_totals(nil, nil, nil).should == 3
   #  end
-  #  
+  #
   #  it "should calculate real-time shipping for a cart" do
   #    @vendor.shipping_type = ShippingType::REAL_TIME_SHIPPING
   #    @vendor.save
@@ -102,7 +102,7 @@
   #    one_product_shipping_total = @cart.shipping_totals(nil, nil, '24091')
   #    two_product_shipping_total.should == 2 * one_product_shipping_total
   #  end
-  
+
   describe "Flat Rate Shipping calculations" do
     before(:each) do
       GeneralConfiguration.instance
@@ -150,10 +150,10 @@
         @order.calculate_shipping_costs.should == 6.00
       end
     end
-    
+
   end
-  
-    
+
+
 
   describe 'Specified products have free shipping:' do
 
@@ -199,4 +199,4 @@
 
 
 end
-  
+
diff --git a/spec/models/cart_spec.rb b/spec/models/cart_spec.rb
index 3785814..80f76c1 100644
--- a/spec/models/cart_spec.rb
+++ b/spec/models/cart_spec.rb
@@ -27,7 +27,7 @@
       new_variant = @product.find_variant_by_selection_ids([@large.id, @blue.id])
       @cart.find_product_or_variant(@product, new_variant).should be_nil
     end
-  
+
   end
 
   describe "#tax_total" do
@@ -57,15 +57,15 @@
       @cart.cart_items.create(:product_id => product1.id, :quantity => 1)
       @cart.cart_items.create(:product_id => @product2.id, :quantity => 2)
     end
-    
+
     it "should calculate sum of product weights multiplied by quantity ordered" do
       @cart.shipping_weight_total.should eql(9.5)
     end
-    
+
     it "should not include free shipping in the weight total" do
       @product2.update_attribute(:free_shipping, true)
       @cart.shipping_weight_total.should eql(2.5)
     end
   end
- 
+
 end
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index 787c579..946be29 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -27,8 +27,8 @@
     sub_category.move_to_child_of @men
     sub_category = Factory(:category, :name => 'long-sleeve', :position => 3)
     sub_category.move_to_child_of @men
-    
-    @categories.root.descendants.size.should == 10 
+
+    @categories.root.descendants.size.should == 10
     @men.children.size.should == 4
     @women.children.size.should == 4
   end
@@ -56,7 +56,7 @@
     sorted[9].position.should == 5
 
 
-    sorted = @men.positioned 
+    sorted = @men.positioned
     sorted[0].position.should == 2
     sorted[1].position.should == 3
     sorted[2].position.should == 4
@@ -70,7 +70,7 @@
     sorted[2].name.should == 'short-sleeve'
     sorted[3].name.should == 'tanks'
 
-    sorted = Category.alphabetical 
+    sorted = Category.alphabetical
     sorted[0].name.should == 'crews'
     sorted[1].name.should == 'cute-tube'
     sorted[2].name.should == 'long'
@@ -82,7 +82,7 @@
     categories = Category.tree('bunk')
     categories.empty?.should == true
 
-    categories = Category.tree('men') 
+    categories = Category.tree('men')
     categories[0].name.should == 'short-sleeve'
     categories[1].name.should == 'long-sleeve'
     categories[2].name.should == 'tanks'
diff --git a/spec/models/general_configuration_spec.rb b/spec/models/general_configuration_spec.rb
index bc2fa04..ba45079 100644
--- a/spec/models/general_configuration_spec.rb
+++ b/spec/models/general_configuration_spec.rb
@@ -7,11 +7,11 @@
       configuration
       GeneralConfiguration.shipping_calculated_by_weight?.should be_false
     end
-    
+
     it "should return false when shipping method is not weight" do
       configuration.update_attribute(:shipping_calculation_method, 'weight')
       GeneralConfiguration.shipping_calculated_by_weight?.should be_true
     end
-    
+
   end
 end
\ No newline at end of file
diff --git a/spec/models/promo_code_spec.rb b/spec/models/promo_code_spec.rb
index dd8f708..38bdbb2 100644
--- a/spec/models/promo_code_spec.rb
+++ b/spec/models/promo_code_spec.rb
@@ -16,41 +16,41 @@
     @order.order_type = '1'
     @order.promo_discount = 0
   end
-  
+
   it 'applies to orders exceeding the minimum amount required' do
     @promo_code.minimum_order_amount = 60.00
     @order.stub!(:sub_total).and_return(60.00)
     message = @promo_code.apply(@order)
     message.should == PromoCode::SUCCESS_MESSAGE
   end
-  
+
   it 'fails to apply to orders not reaching the minimum amount required' do
     @promo_code.minimum_order_amount = 60.00
     @order.stub!(:sub_total).and_return(59.00)
     message = @promo_code.apply(@order)
     message.should == @promo_code.minimum_amount_required_message
   end
-  
+
   it 'activates free shipping' do
     @promo_code.free_shipping = true
     @order.stub!(:sub_total).and_return(59.00)
     @order.free_shipping = false
-    
+
     message = @promo_code.apply(@order)
     @order.free_shipping.should == true
     message.should == PromoCode::SUCCESS_MESSAGE
   end
-  
+
   it 'applies dollar discount' do
     @promo_code.dollar_discount = 5.00
     @order.product_cost = 55.00
-    
+
     message = @promo_code.apply(@order)
-    @order.total.should == sprintf("%.2f", 50.00) 
+    @order.total.should == sprintf("%.2f", 50.00)
     message.should == PromoCode::SUCCESS_MESSAGE
   end
-  
-  it 'applies percentage discount' 
-  
+
+  it 'applies percentage discount'
+
 end
 
diff --git a/spec/models/shipping_method_spec.rb b/spec/models/shipping_method_spec.rb
index d58f772..8729730 100644
--- a/spec/models/shipping_method_spec.rb
+++ b/spec/models/shipping_method_spec.rb
@@ -1,32 +1,32 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe ShippingMethod do
-  
+
   describe "#is_base_rate?" do
     let(:shipping_method) { Factory(:shipping_method)}
-    
+
     it "return true when there are no flat rate shippings set and not configured for weight ranges" do
       shipping_method.is_base_rate?.should be_true
     end
-    
+
     it "return true when there are not configured for weight ranges and flat rate shippings are not yet created" do
       shipping_method.flat_rate_shippings.build(Factory.build(:flat_rate_shipping).attributes)
       shipping_method.flat_rate_shippings.size.should_not eql(0)
       shipping_method.is_base_rate?.should be_true
     end
-    
+
     it "returns false when using weight ranges" do
       GeneralConfiguration.instance.update_attribute(:shipping_calculation_method, 'weight')
       shipping_method.is_base_rate?.should be_false
     end
-    
+
     it "returns false when shipping_method has flat_range_shippings set" do
       shipping_method.flat_rate_shippings << Factory(:flat_rate_shipping)
       shipping_method.is_base_rate?.should be_false
-    end    
-    
+    end
+
   end
-  
+
   describe "#flat_rate_by_order_total" do
     before(:each) do
       @shipping_method = Factory(:shipping_method)
@@ -56,9 +56,9 @@
         @shipping_method.send(:flat_rate_by_weight_total,k).should == v
       end
     end
-    
+
   end
-  
+
   describe "calculate flate rate shipping cost" do
     before(:each) do
       @shipping_method            = Factory(:shipping_method)
diff --git a/spec/order_builder.rb b/spec/order_builder.rb
index da0790f..f256ae1 100644
--- a/spec/order_builder.rb
+++ b/spec/order_builder.rb
@@ -2,7 +2,7 @@
 
 
 class OrderBuilder
-  
+
   def self.build_products(num_products = 1)
     @@products = Array.new
     num_products.times do
@@ -10,7 +10,7 @@ def self.build_products(num_products = 1)
       @@products << product
     end
   end
-  
+
   def self.build_order_items(order)
     @@order_items = Array.new
     @@products.each do |product|
@@ -20,24 +20,24 @@ def self.build_order_items(order)
       @@order_items << order_item
     end
   end
-  
+
   def self.build_order(num_products = 1)
     build_products(num_products)
-    
+
     order = OrderFactory.create_order
-    
+
     billing_address = OrderFactory.create_address
     shipping_address = OrderFactory.create_address
     order.billing_address = billing_address
     order.shipping_address = shipping_address
-    
+
     build_order_items(order)
     order
   end
-  
 
-  
-  
+
+
+
 private
 
 
diff --git a/spec/order_factory.rb b/spec/order_factory.rb
index 6878415..d74e066 100644
--- a/spec/order_factory.rb
+++ b/spec/order_factory.rb
@@ -1,5 +1,5 @@
 module OrderFactory
-  
+
   def self.create_order_item(attributes = {})
     default_attributes = {
       :quantity => 1,
@@ -14,25 +14,25 @@ def self.create_order_item(attributes = {})
     }
     OrderItem.create! default_attributes.merge(attributes)
   end
-  
+
   def self.create_product(attributes = {})
     default_attributes = {
       :sku => '12V2A',
       :available => true,
-      :is_featured => false, 
+      :is_featured => false,
       :name => 'Pro-Speed Racer, Go!',
       :weight => 1.0,
       :short_description => 'short description',
       :long_description => 'long description',
       :price => 5.50,
-      :admin_notes => 'admin notes',   
+      :admin_notes => 'admin notes',
       :created_at => '2007-08-29 19:54:26',
       :updated_at => '2007-08-29 19:54:26'
     }
     Product.create! default_attributes.merge(attributes)
   end
-  
-  
+
+
   def self.create_order(attributes = {})
     default_attributes = {
        :full_name => 'John User',
@@ -40,23 +40,23 @@ def self.create_order(attributes = {})
        :order_number => 'E-1234' + rand.to_s,
        :phone_number => '540-232-1212',
        :created_at => '2007-08-29 19:54:26',
-       :updated_at => '2007-08-29 19:54:26'      
+       :updated_at => '2007-08-29 19:54:26'
      }
      Order.create! default_attributes.merge(attributes)
   end
-  
-  
-  
+
+
+
   def self.create_address(attributes = {})
     default_attributes = {
       :address_1 => '756 Sugar Tree Road',
       :address_2 => '',
       :city => 'Floyd,',
       :state => 'Va',
-      :is_shipping => false, 
+      :is_shipping => false,
       :postal_code => '24573'
     }
     OrderAddress.create! default_attributes.merge(attributes)
   end
-  
+
 end
diff --git a/spec/pebbles_factory.rb b/spec/pebbles_factory.rb
index 95ac80a..2fd1418 100644
--- a/spec/pebbles_factory.rb
+++ b/spec/pebbles_factory.rb
@@ -22,6 +22,6 @@
   f.postal_code     "24091"
   f.is_shipping     true
   f.country         "US"
-  f.state           "VA" 
+  f.state           "VA"
 end
 
diff --git a/spec/rcov.opts b/spec/rcov.opts
index baf694c..274ed51 100644
--- a/spec/rcov.opts
+++ b/spec/rcov.opts
@@ -1,2 +1,2 @@
---exclude "spec/*,gems/*" 
+--exclude "spec/*,gems/*"
 --rails
\ No newline at end of file
diff --git a/tasks/rails.rake b/tasks/rails.rake
index 1987f85..e9a5b9b 100644
--- a/tasks/rails.rake
+++ b/tasks/rails.rake
@@ -5,6 +5,6 @@ namespace :pebbles do
     system "rsync -ruv vendor/plugins/pebbles/db/migrate db"
     system "rsync -ruv vendor/plugins/pebbles/public ."
   end
-  
-    
+
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/active_record_base_without_table/README b/vendor/plugins/active_record_base_without_table/README
index 8200d7a..c5ccd1a 100644
--- a/vendor/plugins/active_record_base_without_table/README
+++ b/vendor/plugins/active_record_base_without_table/README
@@ -3,9 +3,9 @@
 If you find this plugin useful, please consider a donation to show your support!
 
   http://www.paypal.com/cgi-bin/webscr?cmd=_send-money
-  
+
   Email address: jonathan.viney@gmail.com
-  
+
 == Instructions
 
 * For edge Rails r7315 or above use http://svn.viney.net.nz/things/branches/active_record_base_without_table
@@ -16,10 +16,10 @@ Get the power of ActiveRecord models, including validation, without having a tab
     column :name, :string
     column :email_address, :string
     column :message, :text
-    
+
     validates_presence_of :name, :email_address, :string
   end
-  
+
 This model can be used just like a regular model based on a table, except it will never be saved to the database.
 
 There is a good blog post available on the plugin:
diff --git a/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb b/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb
index 91774b0..610607a 100644
--- a/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb
+++ b/vendor/plugins/active_record_base_without_table/lib/active_record/base_without_table.rb
@@ -1,21 +1,21 @@
 module ActiveRecord
   class BaseWithoutTable < Base
     self.abstract_class = true
-    
+
     def create_or_update
       errors.empty?
     end
-    
+
     class << self
       def columns()
         @columns ||= []
       end
-      
+
       def column(name, sql_type = nil, default = nil, null = true)
         columns << ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
         reset_column_information
       end
-      
+
       # Do not reset @columns
       def reset_column_information
         generated_methods.each { |name| undef_method(name) }
diff --git a/vendor/plugins/active_record_base_without_table/test/active_record_base_without_table_test.rb b/vendor/plugins/active_record_base_without_table/test/active_record_base_without_table_test.rb
index 8d4bd41..49266bc 100644
--- a/vendor/plugins/active_record_base_without_table/test/active_record_base_without_table_test.rb
+++ b/vendor/plugins/active_record_base_without_table/test/active_record_base_without_table_test.rb
@@ -3,7 +3,7 @@
 class Person < ActiveRecord::BaseWithoutTable
   column :name, :string
   column :lucky_number, :integer, 4
-  
+
   validates_presence_of :name
 end
 
@@ -11,29 +11,29 @@ class ActiveRecordBaseWithoutTableTest < Test::Unit::TestCase
   def test_default_value
     assert_equal 4, Person.new.lucky_number
   end
-  
+
   def test_validation
     p = Person.new
-    
+
     assert !p.save
     assert p.errors[:name]
-    
+
     assert p.update_attributes(:name => 'Name')
   end
-  
+
   def test_typecast
     assert_equal 1, Person.new(:lucky_number => "1").lucky_number
   end
-  
+
   def test_cached_column_variables_reset_when_column_defined
     cached_variables = %w(column_names columns_hash content_columns dynamic_methods_hash read_methods)
-    
+
     Person.column_names
     Person.columns_hash
     Person.content_columns
     Person.column_methods_hash
     Person.read_methods
-    
+
     cached_variables.each { |v| assert_not_nil Person.instance_variable_get("@#{v}") }
     Person.column :new_column, :string
     cached_variables.each { |v| assert_nil Person.instance_variable_get("@#{v}") }
diff --git a/vendor/plugins/active_record_base_without_table/test/database.yml b/vendor/plugins/active_record_base_without_table/test/database.yml
index 76d532f..d6dedc2 100644
--- a/vendor/plugins/active_record_base_without_table/test/database.yml
+++ b/vendor/plugins/active_record_base_without_table/test/database.yml
@@ -2,5 +2,5 @@ mysql:
   :adapter: mysql
   :host: localhost
   :username: rails
-  :password: 
+  :password:
   :database: rails_plugin_test
diff --git a/vendor/plugins/enkoder/README b/vendor/plugins/enkoder/README
index 6f006f1..d458925 100644
--- a/vendor/plugins/enkoder/README
+++ b/vendor/plugins/enkoder/README
@@ -23,7 +23,7 @@ Just drop the "enkoder" folder into the /vendor/plugins folder in your project.
 There are two methods:
 
 	enkode( html )
-	
+
 This method accepts a block of html (or any text) and returns an enkoded JavaScript.
 
 The second method is:
diff --git a/vendor/plugins/enkoder/lib/enkoder.rb b/vendor/plugins/enkoder/lib/enkoder.rb
index 833daed..28fc3d8 100644
--- a/vendor/plugins/enkoder/lib/enkoder.rb
+++ b/vendor/plugins/enkoder/lib/enkoder.rb
@@ -1,20 +1,20 @@
 # Copyright (c) 2007, Hivelogic Corporation.
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
-# 
+#
 # 	1. Redistributions of source code must retain the above copyright notice,
 # 	this list of conditions and the following disclaimer.
-# 
+#
 # 	2. Redistributions in binary form must reproduce the above copyright notice,
 # 	this list of conditions and the following disclaimer in the documentation
 # 	and/or other materials provided with the distribution.
-# 
+#
 # 	3. Neither the name of HIVELOGIC CORPORATION nor the names of its contributors
 #   may be used to endorse or promote products derived from this software
 #   without specific prior written permission.
-# 
+#
 # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -94,7 +94,7 @@ def enkode( html, max_length=1024 )
         result
 
       end
-      
+
       def enkode_mail( email, link_text, title_text=nil, subject=nil )
         str = String.new
         str << '<a href="mailto:' + email
diff --git a/vendor/plugins/exception_notification/lib/exception_notifiable.rb b/vendor/plugins/exception_notification/lib/exception_notifiable.rb
index d5e28fc..5141f83 100644
--- a/vendor/plugins/exception_notification/lib/exception_notifiable.rb
+++ b/vendor/plugins/exception_notification/lib/exception_notifiable.rb
@@ -82,7 +82,7 @@ def rescue_action_in_public(exception)
         when *self.class.exceptions_to_treat_as_404
           render_404
 
-        else          
+        else
           render_500
 
           deliverer = self.class.exception_data
diff --git a/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb b/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb
index 37f4e25..3014369 100644
--- a/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb
+++ b/vendor/plugins/exception_notification/lib/exception_notifier_helper.rb
@@ -65,11 +65,11 @@ def object_to_yaml(object)
   def exclude_raw_post_parameters?
     @controller && @controller.respond_to?(:filter_parameters)
   end
-  
+
   def filter_sensitive_post_data_parameters(parameters)
     exclude_raw_post_parameters? ? @controller.send(:filter_parameters, parameters) : parameters
   end
-  
+
   def filter_sensitive_post_data_from_env(env_key, env_value)
     return env_value unless exclude_raw_post_parameters?
     return PARAM_FILTER_REPLACEMENT if (env_key =~ /RAW_POST_DATA/i)
diff --git a/vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb b/vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb
index dd47637..bf08f19 100644
--- a/vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb
+++ b/vendor/plugins/exception_notification/test/exception_notifier_helper_test.rb
@@ -12,13 +12,13 @@ def setup
   end
 
   # No controller
-  
+
   def test_should_not_exclude_raw_post_parameters_if_no_controller
     assert !@helper.exclude_raw_post_parameters?
   end
-  
+
   # Controller, no filtering
-  
+
   class ControllerWithoutFilterParameters; end
 
   def test_should_not_filter_env_values_for_raw_post_data_keys_if_controller_can_not_filter_parameters
@@ -27,7 +27,7 @@ def test_should_not_filter_env_values_for_raw_post_data_keys_if_controller_can_n
   end
   def test_should_not_exclude_raw_post_parameters_if_controller_can_not_filter_parameters
     stub_controller(ControllerWithoutFilterParameters.new)
-    assert !@helper.exclude_raw_post_parameters?    
+    assert !@helper.exclude_raw_post_parameters?
   end
   def test_should_return_params_if_controller_can_not_filter_parameters
     stub_controller(ControllerWithoutFilterParameters.new)
@@ -53,7 +53,7 @@ def test_should_delegate_param_filtering_to_controller_if_controller_can_filter_
     stub_controller(ControllerWithFilterParameters.new)
     assert_equal :filtered, @helper.filter_sensitive_post_data_parameters(:params)
   end
-  
+
   private
     def stub_controller(controller)
       @helper.instance_variable_set(:@controller, controller)
diff --git a/vendor/plugins/generators/authenticated/authenticated_generator.rb b/vendor/plugins/generators/authenticated/authenticated_generator.rb
index 962fb27..44a4569 100644
--- a/vendor/plugins/generators/authenticated/authenticated_generator.rb
+++ b/vendor/plugins/generators/authenticated/authenticated_generator.rb
@@ -2,7 +2,7 @@
 class AuthenticatedGenerator < Rails::Generator::NamedBase
   default_options :skip_migration => false,
                   :include_activation => false
-                  
+
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
@@ -26,7 +26,7 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    
+
     @rspec = has_rspec?
 
     @controller_name = args.shift || 'sessions'
@@ -46,7 +46,7 @@ def initialize(runtime_args, runtime_options = {})
     # model controller
     base_name, @model_controller_class_path, @model_controller_file_path, @model_controller_class_nesting, @model_controller_class_nesting_depth = extract_modules(@model_controller_name)
     @model_controller_class_name_without_nesting, @model_controller_singular_name, @model_controller_plural_name = inflect_names(base_name)
-    
+
     if @model_controller_class_nesting.empty?
       @model_controller_class_name = @model_controller_class_name_without_nesting
     else
@@ -181,7 +181,7 @@ def manifest
           :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
       end
-      
+
       m.route_resource  controller_singular_name
       m.route_resources model_controller_plural_name
     end
@@ -189,7 +189,7 @@ def manifest
     action = nil
     action = $0.split("/")[1]
     case action
-      when "generate" 
+      when "generate"
         puts
         puts ("-" * 70)
         puts "Don't forget to:"
@@ -215,7 +215,7 @@ def manifest
         puts
         puts ("-" * 70)
         puts
-      when "destroy" 
+      when "destroy"
         puts
         puts ("-" * 70)
         puts
@@ -237,7 +237,7 @@ def manifest
   def has_rspec?
     options[:rspec] || (File.exist?('spec') && File.directory?('spec'))
   end
-  
+
   protected
     # Override with your own usage banner.
     def banner
@@ -247,11 +247,11 @@ def banner
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
-      opt.on("--skip-migration", 
+      opt.on("--skip-migration",
              "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
-      opt.on("--include-activation", 
+      opt.on("--include-activation",
              "Generate signup 'activation code' confirmation via email") { |v| options[:include_activation] = true }
-      opt.on("--stateful", 
+      opt.on("--stateful",
              "Use acts_as_state_machine.  Assumes --include-activation") { |v| options[:include_activation] = options[:stateful] = true }
       opt.on("--rspec",
              "Force rspec mode (checks for RAILS_ROOT/spec by default)") { |v| options[:rspec] = true }
diff --git a/vendor/plugins/generators/authenticated/templates/controller.rb b/vendor/plugins/generators/authenticated/templates/controller.rb
index 50f8dc5..cb03585 100644
--- a/vendor/plugins/generators/authenticated/templates/controller.rb
+++ b/vendor/plugins/generators/authenticated/templates/controller.rb
@@ -1,4 +1,4 @@
-# This controller handles the login/logout function of the site.  
+# This controller handles the login/logout function of the site.
 class <%= controller_class_name %>Controller < ApplicationController
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
diff --git a/vendor/plugins/generators/authenticated/templates/functional_spec.rb b/vendor/plugins/generators/authenticated/templates/functional_spec.rb
index 8c7bf0d..e10aa73 100644
--- a/vendor/plugins/generators/authenticated/templates/functional_spec.rb
+++ b/vendor/plugins/generators/authenticated/templates/functional_spec.rb
@@ -12,7 +12,7 @@
     session[:<%= file_name %>_id].should_not be_nil
     response.should be_redirect
   end
-  
+
   it 'fails login and does not redirect' do
     post :create, :login => 'quentin', :password => 'bad password'
     session[:<%= file_name %>_id].should be_nil
@@ -30,7 +30,7 @@
     post :create, :login => 'quentin', :password => 'test', :remember_me => "1"
     response.cookies["auth_token"].should_not be_nil
   end
-  
+
   it 'does not remember me' do
     post :create, :login => 'quentin', :password => 'test', :remember_me => "0"
     response.cookies["auth_token"].should be_nil
@@ -48,7 +48,7 @@
     get :new
     controller.send(:logged_in?).should be_true
   end
-  
+
   it 'fails expired cookie login' do
     <%= table_name %>(:quentin).remember_me
     <%= table_name %>(:quentin).update_attribute :remember_token_expires_at, 5.minutes.ago
@@ -56,7 +56,7 @@
     get :new
     controller.send(:logged_in?).should_not be_true
   end
-  
+
   it 'fails cookie login' do
     <%= table_name %>(:quentin).remember_me
     request.cookies["auth_token"] = auth_token('invalid_auth_token')
@@ -67,7 +67,7 @@
   def auth_token(token)
     CGI::Cookie.new('name' => 'auth_token', 'value' => token)
   end
-    
+
   def cookie_for(<%= file_name %>)
     auth_token <%= table_name %>(<%= file_name %>).remember_token
   end
diff --git a/vendor/plugins/generators/authenticated/templates/functional_test.rb b/vendor/plugins/generators/authenticated/templates/functional_test.rb
index acce43b..99c886b 100644
--- a/vendor/plugins/generators/authenticated/templates/functional_test.rb
+++ b/vendor/plugins/generators/authenticated/templates/functional_test.rb
@@ -45,7 +45,7 @@ def test_should_not_remember_me
     post :create, :login => 'quentin', :password => 'test', :remember_me => "0"
     assert_nil @response.cookies["auth_token"]
   end
-  
+
   def test_should_delete_token_on_logout
     login_as :quentin
     get :destroy
@@ -78,7 +78,7 @@ def test_should_fail_cookie_login
     def auth_token(token)
       CGI::Cookie.new('name' => 'auth_token', 'value' => token)
     end
-    
+
     def cookie_for(<%= file_name %>)
       auth_token <%= table_name %>(<%= file_name %>).remember_token
     end
diff --git a/vendor/plugins/generators/authenticated/templates/mailer.rb b/vendor/plugins/generators/authenticated/templates/mailer.rb
index f6e092b..fc1072e 100644
--- a/vendor/plugins/generators/authenticated/templates/mailer.rb
+++ b/vendor/plugins/generators/authenticated/templates/mailer.rb
@@ -7,13 +7,13 @@ def signup_notification(<%= file_name %>)
   <% else %>
     @body[:url]  = "http://YOURSITE/login/" <% end %>
   end
-  
+
   def activation(<%= file_name %>)
     setup_email(<%= file_name %>)
     @subject    += 'Your account has been activated!'
     @body[:url]  = "http://YOURSITE/"
   end
-  
+
   protected
     def setup_email(<%= file_name %>)
       @recipients  = "#{<%= file_name %>.email}"
diff --git a/vendor/plugins/generators/authenticated/templates/model.rb b/vendor/plugins/generators/authenticated/templates/model.rb
index 4f65dde..85dca93 100644
--- a/vendor/plugins/generators/authenticated/templates/model.rb
+++ b/vendor/plugins/generators/authenticated/templates/model.rb
@@ -27,15 +27,15 @@ class <%= class_name %> < ActiveRecord::Base
   event :register do
     transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
   end
-  
+
   event :activate do
-    transitions :from => :pending, :to => :active 
+    transitions :from => :pending, :to => :active
   end
-  
+
   event :suspend do
     transitions :from => [:passive, :pending, :active], :to => :suspended
   end
-  
+
   event :delete do
     transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
   end
@@ -66,10 +66,10 @@ def pending?
 <% end %>
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password)
-    u = <% 
+    u = <%
     if options[:stateful] %>find_in_state :first, :active, :conditions => {:login => login}<%
-    elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<% 
-    else %>find_by_login(login)<% 
+    elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<%
+    else %>find_by_login(login)<%
     end %> # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end
@@ -89,7 +89,7 @@ def authenticated?(password)
   end
 
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
 
   # These create and unset the fields required for remembering users between browser closes
@@ -114,13 +114,13 @@ def forget_me
   end
 
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
       self.crypted_password = encrypt(password)
     end
-      
+
     def password_required?
       crypted_password.blank? || !password.blank?
     end
diff --git a/vendor/plugins/generators/authenticated/templates/model_controller.rb b/vendor/plugins/generators/authenticated/templates/model_controller.rb
index 7d47b19..93a3737 100644
--- a/vendor/plugins/generators/authenticated/templates/model_controller.rb
+++ b/vendor/plugins/generators/authenticated/templates/model_controller.rb
@@ -13,7 +13,7 @@ def new
 
   def create
     cookies.delete :auth_token
-    # protects against session fixation attacks, wreaks havoc with 
+    # protects against session fixation attacks, wreaks havoc with
     # request forgery protection.
     # uncomment at your own risk
     # reset_session
@@ -36,12 +36,12 @@ def activate
   end
 <% end %><% if options[:stateful] %>
   def suspend
-    @<%= file_name %>.suspend! 
+    @<%= file_name %>.suspend!
     redirect_to <%= table_name %>_path
   end
 
   def unsuspend
-    @<%= file_name %>.unsuspend! 
+    @<%= file_name %>.unsuspend!
     redirect_to <%= table_name %>_path
   end
 
diff --git a/vendor/plugins/generators/authenticated/templates/model_functional_spec.rb b/vendor/plugins/generators/authenticated/templates/model_functional_spec.rb
index 74ea748..bc61f3d 100644
--- a/vendor/plugins/generators/authenticated/templates/model_functional_spec.rb
+++ b/vendor/plugins/generators/authenticated/templates/model_functional_spec.rb
@@ -10,7 +10,7 @@
   it 'allows signup' do
     lambda do
       create_<%= file_name %>
-      response.should be_redirect      
+      response.should be_redirect
     end.should change(<%= class_name %>, :count).by(1)
   end
 
@@ -21,7 +21,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   it 'requires password on signup' do
     lambda do
       create_<%= file_name %>(:password => nil)
@@ -29,7 +29,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   it 'requires password confirmation on signup' do
     lambda do
       create_<%= file_name %>(:password_confirmation => nil)
@@ -45,7 +45,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   <% if options[:include_activation] %>
   it 'activates user' do
     <%= class_name %>.authenticate('aaron', 'test').should be_nil
@@ -54,17 +54,17 @@
     flash[:notice].should_not be_nil
     <%= class_name %>.authenticate('aaron', 'test').should == <%= table_name %>(:aaron)
   end
-  
+
   it 'does not activate user without key' do
       get :activate
       flash[:notice].should be_nil
   end
-  
+
   it 'does not activate user with blank key' do
       get :activate, :activation_code => ''
       flash[:notice].should be_nil
   end<% end %>
-  
+
   def create_<%= file_name %>(options = {})
     post :create, :<%= file_name %> => { :login => 'quire', :email => 'quire@example.com',
       :password => 'quire', :password_confirmation => 'quire' }.merge(options)
diff --git a/vendor/plugins/generators/authenticated/templates/model_functional_test.rb b/vendor/plugins/generators/authenticated/templates/model_functional_test.rb
index 29165ae..57dce20 100644
--- a/vendor/plugins/generators/authenticated/templates/model_functional_test.rb
+++ b/vendor/plugins/generators/authenticated/templates/model_functional_test.rb
@@ -63,7 +63,7 @@ def test_should_activate_user
     assert_not_nil flash[:notice]
     assert_equal <%= table_name %>(:aaron), <%= class_name %>.authenticate('aaron', 'test')
   end
-  
+
   def test_should_not_activate_user_without_key
     get :activate
     assert_nil flash[:notice]
diff --git a/vendor/plugins/generators/authenticated/templates/unit_spec.rb b/vendor/plugins/generators/authenticated/templates/unit_spec.rb
index 312d3de..334fb86 100644
--- a/vendor/plugins/generators/authenticated/templates/unit_spec.rb
+++ b/vendor/plugins/generators/authenticated/templates/unit_spec.rb
@@ -6,7 +6,7 @@
 
 describe <%= class_name %> do
   fixtures :<%= table_name %>
-  
+
   it 'creates <%= file_name %>' do
     lambda do
       <%= file_name %> = create_<%= file_name %>
diff --git a/vendor/plugins/generators/role/role_generator.rb b/vendor/plugins/generators/role/role_generator.rb
index c63665c..b6473d5 100644
--- a/vendor/plugins/generators/role/role_generator.rb
+++ b/vendor/plugins/generators/role/role_generator.rb
@@ -1,22 +1,22 @@
 require( File.join( File.dirname(__FILE__), "../role_generator_helpers" ))
 
 class RoleGenerator < Rails::Generator::NamedBase
-  
+
   include RoleGeneratorHelpers
-  
-  attr_accessor :users_table_name, 
+
+  attr_accessor :users_table_name,
     :users_model_name,
     :next_user_id
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     @users_model_name = (runtime_args[0] || "User").classify
-    
+
     @users_table_name = @users_model_name.tableize
-    
+
     puts "Generating role column for #{@users_model_name}"
   end
-  
+
   def manifest
     record do |m|
       add_method_to_user_model(m)
@@ -26,36 +26,36 @@ def manifest
       add_migration(m) unless options[:skip_migration]
     end
   end
-  
+
   def add_method_to_user_model(m)
     # modify the User model unless it's already got RoleRequirement code in there
     content_for_insertion = render_template("_user_functions.erb")
-    
+
     if insert_content_after(users_model_filename,
                             Regexp.new("class +#{users_model_name}"),
                             content_for_insertion,
                             :unless => lambda { |content| content.include? "def has_role?"; }
                             )
-      
+
       puts "Added the following to the top of #{users_model_filename}:\n#{content_for_insertion}"
     else
       puts "Not modifying #{users_model_filename} because it appears that the funtion has_role? already exists."
     end
   end
-  
+
   def add_migration(m)
     m.migration_template '001_add_role_to_users_migration.rb.erb', 'db/migrate', :assigns => {
       :migration_name => "AddRoleTo#{users_model_name.pluralize.gsub(/::/, '')}"
     }, :migration_file_name => "add_role_to_#{users_table_name}"
   end
-  
+
   def render_template(name)
     template = File.read( File.join( File.dirname(__FILE__), "templates", name))
     ERB.new(template, nil, "-").result(binding)
   end
 
 protected
-  
+
   def banner
     "Usage: #{$0} role [TargetUserModelName]"
   end
diff --git a/vendor/plugins/generators/role/templates/_user_functions.erb b/vendor/plugins/generators/role/templates/_user_functions.erb
index 3de64e3..b39c71f 100644
--- a/vendor/plugins/generators/role/templates/_user_functions.erb
+++ b/vendor/plugins/generators/role/templates/_user_functions.erb
@@ -1,20 +1,19 @@
-  
-  
-  
+
+
+
   # ---------------------------------------
   # The following code has been generated by role_requirement.
   # You may wish to modify it to suit your need
-  
+
   attr_protected :role
-  
-  # has_role? simply needs to return true or false whether a user has a role or not.  
+
+  # has_role? simply needs to return true or false whether a user has a role or not.
   # It may be a good idea to have "admin" roles return true always
   def has_role?(role_in_question)
     return true if self.role=="admin"
     self.role == role_in_question.to_s
   end
-  
+
   # ---------------------------------------
-  
-  
-  
\ No newline at end of file
+
+
diff --git a/vendor/plugins/generators/role_generator_helpers.rb b/vendor/plugins/generators/role_generator_helpers.rb
index a9755c0..3879c72 100644
--- a/vendor/plugins/generators/role_generator_helpers.rb
+++ b/vendor/plugins/generators/role_generator_helpers.rb
@@ -7,15 +7,15 @@ def insert_content_after(filename, regexp, content_for_insertion, options = {})
       # find the line that has the model declaration
       lines = content.split("\n")
       found_line = nil
-      
-      0.upto(lines.length-1) {|line_number| 
+
+      0.upto(lines.length-1) {|line_number|
         found_line = line_number if regexp.match(lines[line_number])
       }
       if found_line
         # insert the rest of these lines after the found line
         lines.insert(found_line+1, content_for_insertion)
         content = lines * "\n"
-        
+
         File.open(filename, "w") {|f| f.puts content }
         return true
       end
@@ -23,7 +23,7 @@ def insert_content_after(filename, regexp, content_for_insertion, options = {})
       return false
     end
   end
-  
+
   def add_role_requirement_system(m)
     m.template '../../shared_templates/role_requirement_system.rb.erb',
           File.join('lib', "role_requirement_system.rb")
@@ -32,17 +32,17 @@ def add_role_requirement_system(m)
     m.template '../../shared_templates/hijacker.rb',
           File.join('lib', "hijacker.rb")
   end
-  
+
   def add_dependencies_to_test_helper_rb
     app_filename = "#{RAILS_ROOT}/test/test_helper.rb"
-    
+
     test_helper_content = <<EOF
   # RoleRequirementTestHelper must be included to test RoleRequirement
   include RoleRequirementTestHelper
 EOF
     insert_content_after(
-      app_filename, 
-      /class +Test::Unit::TestCase/, 
+      app_filename,
+      /class +Test::Unit::TestCase/,
       test_helper_content,
       :unless => lambda {|content| /include +RoleRequirementTestHelper/.match(content) }
     ) && puts("Added RoleRequirementTestHelper include to #{app_filename}")
@@ -50,35 +50,35 @@ def add_dependencies_to_test_helper_rb
 
   def add_dependencies_to_application_rb
     app_filename = "#{RAILS_ROOT}/app/controllers/application.rb"
-    
+
     auth_system_content = <<EOF
   # AuthenticatedSystem must be included for RoleRequirement, and is provided by installing acts_as_authenticates and running 'script/generate authenticated account user'.
   include AuthenticatedSystem
 EOF
-    
+
     role_requirement_content = <<EOF
   # You can move this into a different controller, if you wish.  This module gives you the require_role helpers, and others.
   include RoleRequirementSystem
 EOF
 
     insert_content_after(
-      app_filename, 
-      /class +ApplicationController/, 
+      app_filename,
+      /class +ApplicationController/,
       auth_system_content,
       :unless => lambda {|content| /include +AuthenticatedSystem/.match(content) }
     ) && puts("Added ApplicationController include to #{app_filename}")
-    
+
     insert_content_after(
-      app_filename, 
-      /include +AuthenticatedSystem/, 
+      app_filename,
+      /include +AuthenticatedSystem/,
       role_requirement_content,
       :unless => lambda {|content| /include +RoleRequirementSystem/.match(content) }
     ) && puts("Added RoleRequirement include to #{app_filename}")
-    
+
   end
-  
+
   def users_model_filename;  "app/models/#{users_model_name.underscore}.rb"; end;
-    
+
   def users_name;  "#{users_model_name.downcase}"; end;
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/generators/roles/roles_generator.rb b/vendor/plugins/generators/roles/roles_generator.rb
index 3388b78..98000d5 100644
--- a/vendor/plugins/generators/roles/roles_generator.rb
+++ b/vendor/plugins/generators/roles/roles_generator.rb
@@ -1,33 +1,33 @@
 require( File.join( File.dirname(__FILE__), "../role_generator_helpers" ))
 
 class RolesGenerator < Rails::Generator::NamedBase
-  
+
   include RoleGeneratorHelpers
-  
-  attr_accessor :roles_model_name, 
-    :roles_table_name, 
-    :users_table_name, 
+
+  attr_accessor :roles_model_name,
+    :roles_table_name,
+    :users_table_name,
     :users_model_name,
     :next_user_id
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     @roles_model_name = (runtime_args[0] || "Role").classify
     @users_model_name = (runtime_args[1] || "User").classify
-    
+
     @roles_table_name = @roles_model_name.tableize
     @users_table_name = @users_model_name.tableize
-    
+
     puts "Generating #{@roles_model_name} against #{@users_model_name}"
   end
-  
+
   def manifest
     record do |m|
       modify_or_add_user_fixtures(m)
       add_roles_and_join_table_fixtures(m)
-      
+
       add_method_to_user_model(m)
-      
+
       add_role_model(m)
       add_dependencies_to_application_rb
       add_dependencies_to_test_helper_rb
@@ -35,12 +35,12 @@ def manifest
       add_migration(m) unless options[:skip_migration]
     end
   end
-  
+
   def add_role_model(m)
     # add the Role model
     m.template 'role_model.rb.erb', roles_model_filename
   end
-  
+
   def add_method_to_user_model(m)
     content_for_insertion = render_template("_user_functions.erb")
     # modify the User model unless it's already got RoleRequirement code in there
@@ -54,19 +54,19 @@ def add_method_to_user_model(m)
       puts "Not modifying #{users_model_filename} because it appears that the funtion has_role? already exists."
     end
   end
-    
+
   def modify_or_add_user_fixtures(m)
     if (File.exists?(users_fixture_filename))
       users_fixtures_content = File.read users_fixture_filename
       users_fixtures = YAML.load(users_fixtures_content)
-      
+
       begin
         throw "Can't understand whatever is in #{users_fixture_filename}" unless Hash===users_fixtures
-        
+
         unless users_fixtures.has_key?("admin")
           @next_user_id = (users_fixtures.collect{ |k, params| params["id"].to_i}.max||0) + 1
           output = users_fixtures_content + "\n" + render_template("users_admin_fixture_with_roles.yml")
-          
+
           # prevent generator from truncating the whole file if something goes wrong.
           if output.length > users_fixtures_content.length
             File.open(users_fixture_filename, "w") {|f| f.write(output) }
@@ -81,31 +81,31 @@ def modify_or_add_user_fixtures(m)
     else
       # users.yml doesn't exist.  Generate it from scratch
       @next_user_id = 1
-      
+
       m.template 'users_admin_fixture_with_roles.yml',
         File.join('test/fixtures', "#{users_table_name}.yml")
     end
 
   end
-  
+
   def add_migration(m)
     m.migration_template '001_roles_migration.rb.erb', 'db/migrate', :assigns => {
       :migration_name => "Create#{roles_model_name.pluralize.gsub(/::/, '')}"
     }, :migration_file_name => "create_#{roles_table_name}"
   end
-  
+
   def add_roles_and_join_table_fixtures(m)
     m.template 'roles_users.yml',
               File.join('test/fixtures', "#{habtm_name}.yml")
     m.template 'roles.yml',
               File.join('test/fixtures', "#{roles_table_name}.yml")
   end
-  
+
   def render_template(name)
     template = File.read( File.join( File.dirname(__FILE__), "templates", name))
     ERB.new(template, nil, "-").result(binding)
   end
-  
+
   def habtm_name;       [roles_table_name, users_table_name].sort * "_"; end
   def roles_foreign_key; roles_table_name.singularize.foreign_key; end
   def roles_model_filename;  "app/models/#{roles_model_name.underscore}.rb"; end;
diff --git a/vendor/plugins/generators/roles/templates/001_roles_migration.rb.erb b/vendor/plugins/generators/roles/templates/001_roles_migration.rb.erb
index 1172354..bb29b9c 100644
--- a/vendor/plugins/generators/roles/templates/001_roles_migration.rb.erb
+++ b/vendor/plugins/generators/roles/templates/001_roles_migration.rb.erb
@@ -3,7 +3,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     create_table "<%= roles_table_name %>" do |t|
       t.column :name, :string
     end
-    
+
     # generate the join table
     create_table "<%= habtm_name %>", :id => false do |t|
       t.column "<%= roles_foreign_key %>", :integer
diff --git a/vendor/plugins/generators/roles/templates/_user_functions.erb b/vendor/plugins/generators/roles/templates/_user_functions.erb
index 38c46e5..a8a8565 100644
--- a/vendor/plugins/generators/roles/templates/_user_functions.erb
+++ b/vendor/plugins/generators/roles/templates/_user_functions.erb
@@ -1,15 +1,15 @@
-  
-  
-  
+
+
+
   # ---------------------------------------
   # The following code has been generated by role_requirement.
   # You may wish to modify it to suit your need
   has_and_belongs_to_many :<%=roles_table_name%>
-  
+
   attr_protected :roles
 
-  
-  # has_role? simply needs to return true or false whether a user has a role or not.  
+
+  # has_role? simply needs to return true or false whether a user has a role or not.
   # It may be a good idea to have "admin" roles return true always
   def has_role?(role_in_question)
     @<%roles_table_name%>_list ||= self.<%=roles_table_name%>.collect(&:name)
@@ -17,7 +17,6 @@
     (@<%roles_table_name%>_list.include?(role_in_question.to_s) )
   end
   # ---------------------------------------
-  
-  
-  
-  
\ No newline at end of file
+
+
+
diff --git a/vendor/plugins/generators/roles/templates/role_model.rb.erb b/vendor/plugins/generators/roles/templates/role_model.rb.erb
index 254ceb1..7085253 100644
--- a/vendor/plugins/generators/roles/templates/role_model.rb.erb
+++ b/vendor/plugins/generators/roles/templates/role_model.rb.erb
@@ -1,3 +1,3 @@
 class <%= class_name %> < ActiveRecord::Base
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/generators/shared_templates/hijacker.rb b/vendor/plugins/generators/shared_templates/hijacker.rb
index 7eb02f6..bfa3ec5 100644
--- a/vendor/plugins/generators/shared_templates/hijacker.rb
+++ b/vendor/plugins/generators/shared_templates/hijacker.rb
@@ -19,19 +19,19 @@ def initialize(klass)
     @target_klass = klass
     @method_stores = {}
   end
-  
+
   def hijack_class_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(class_self_instance, method_name, eval_string, arg_names, &block )
   end
-  
+
   def hijack_instance_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(@target_klass, method_name, eval_string, arg_names, &block )
   end
-  
-  # restore all 
+
+  # restore all
   def restore
     @method_stores.each_pair{|klass, method_stores|
-      method_stores.reverse_each{ |method_name, method| 
+      method_stores.reverse_each{ |method_name, method|
         klass.send :undef_method, method_name
         klass.send :define_method, method_name, method if method
       }
@@ -41,27 +41,27 @@ def restore
   rescue
     false
   end
-  
-protected  
+
+protected
 
   def class_self_instance
     @target_klass.send :eval, "class << self; self; end;"
   end
-  
+
   def hijack_method(klass, method_name, eval_string = nil, arg_names = [], &block)
     method_name = method_name.to_s
-    # You have got love ruby!  What other language allows you to pillage and plunder a class like this? 
-    
+    # You have got love ruby!  What other language allows you to pillage and plunder a class like this?
+
     (@method_stores[klass]||=[]) << [
-      method_name, 
+      method_name,
       klass.instance_methods.include?(method_name) && klass.instance_method(method_name)
     ]
-    
+
     klass.send :undef_method, method_name
     if Symbol === eval_string
       klass.send :define_method, method_name, klass.instance_methods(eval_string)
     elsif String === eval_string
-      klass.class_eval <<-EOF 
+      klass.class_eval <<-EOF
         def #{method_name}(#{arg_names * ','})
           #{eval_string}
         end
@@ -69,10 +69,10 @@ def #{method_name}(#{arg_names * ','})
     elsif block_given?
       klass.send :define_method, method_name, block
     end
-    
+
     true
   rescue
     false
   end
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/generators/shared_templates/role_requirement_system.rb.erb b/vendor/plugins/generators/shared_templates/role_requirement_system.rb.erb
index cbd8b8f..56b540f 100644
--- a/vendor/plugins/generators/shared_templates/role_requirement_system.rb.erb
+++ b/vendor/plugins/generators/shared_templates/role_requirement_system.rb.erb
@@ -1,4 +1,4 @@
-# Main module for authentication.  
+# Main module for authentication.
 # Include this in ApplicationController to activate RoleRequirement
 #
 # See RoleSecurityClassMethods for some methods it provides.
@@ -7,21 +7,21 @@ module RoleRequirementSystem
     klass.send :class_inheritable_array, :role_requirements
     klass.send :include, RoleSecurityInstanceMethods
     klass.send :extend, RoleSecurityClassMethods
-    klass.send :helper_method, :url_options_authenticate? 
-    
+    klass.send :helper_method, :url_options_authenticate?
+
     klass.send :role_requirements=, []
-    
+
   end
-  
+
   module RoleSecurityClassMethods
-    
+
     def reset_role_requirements!
       self.role_requirements.clear
     end
-    
+
     # Add this to the top of your controller to require a role in order to access it.
     # Example Usage:
-    # 
+    #
     #    require_role "contractor"
     #    require_role "admin", :only => :destroy # don't allow contractors to destroy
     #    require_role "admin", :only => :update, :unless => "current_<%= users_name %>.authorized_for_listing?(params[:id]) "
@@ -29,40 +29,40 @@ module RoleRequirementSystem
     # Valid options
     #
     #  * :only - Only require the role for the given actions
-    #  * :except - Require the role for everything but 
+    #  * :except - Require the role for everything but
     #  * :if - a Proc or a string to evaluate.  If it evaluates to true, the role is required.
     #  * :unless - The inverse of :if
-    #    
+    #
     def require_role(roles, options = {})
       options.assert_valid_keys(:if, :unless,
-        :for, :only, 
+        :for, :only,
         :for_all_except, :except
       )
-      
+
       # only declare that before filter once
       unless (@before_filter_declared||=false)
         @before_filter_declared=true
         before_filter :check_roles
       end
-      
+
       # convert to an array if it isn't already
       roles = [roles] unless Array===roles
-      
+
       options[:only] ||= options[:for] if options[:for]
       options[:except] ||= options[:for_all_except] if options[:for_all_except]
-      
+
       # convert any actions into symbols
       for key in [:only, :except]
         if options.has_key?(key)
           options[key] = [options[key]] unless Array === options[key]
           options[key] = options[key].compact.collect{|v| v.to_sym}
-        end 
+        end
       end
-      
+
       self.role_requirements||=[]
       self.role_requirements << {:roles => roles, :options => options }
     end
-    
+
     # This is the core of RoleRequirement.  Here is where it discerns if a <%= users_name %> can access a controller or not./
     def <%= users_name %>_authorized_for?(<%= users_name %>, params = {}, binding = self.binding)
       return true unless Array===self.role_requirements
@@ -70,44 +70,44 @@ module RoleRequirementSystem
         roles = role_requirement[:roles]
         options = role_requirement[:options]
         # do the options match the params?
-        
+
         # check the action
         if options.has_key?(:only)
           next unless options[:only].include?( (params[:action]||"index").to_sym )
         end
-        
+
         if options.has_key?(:except)
           next if options[:except].include?( (params[:action]||"index").to_sym)
         end
-        
+
         if options.has_key?(:if)
           # execute the proc.  if the procedure returns false, we don't need to authenticate these roles
           next unless ( String===options[:if] ? eval(options[:if], binding) : options[:if].call(params) )
         end
-        
+
         if options.has_key?(:unless)
           # execute the proc.  if the procedure returns true, we don't need to authenticate these roles
           next if ( String===options[:unless] ? eval(options[:unless], binding) : options[:unless].call(params) )
         end
-        
+
         # check to see if they have one of the required roles
         passed = false
         roles.each { |role|
           passed = true if <%= users_name %>.has_role?(role)
         } unless (<%= users_name %>==:false || <%= users_name %>==false)
-        
+
         return false unless passed
       }
-      
+
       return true
     end
   end
-  
+
   module RoleSecurityInstanceMethods
     def self.included(klass)
       raise "Because role_requirement extends acts_as_authenticated, You must include AuthenticatedSystem first before including RoleRequirementSystem!" unless klass.included_modules.include?(AuthenticatedSystem)
     end
-    
+
     def access_denied
       if logged_in?
         render :nothing => true, :status => 401
@@ -116,17 +116,17 @@ module RoleRequirementSystem
         super
       end
     end
-    
-    def check_roles       
+
+    def check_roles
       return access_denied unless self.class.<%= users_name %>_authorized_for?(current_<%= users_name %>, params, binding)
-      
+
       true
     end
-    
+
   protected
     # receives a :controller, :action, and :params.  Finds the given controller and runs <%= users_name %>_authorized_for? on it.
-    # This can be called in your views, and is for advanced users only.  If you are using :if / :unless eval expressions, 
-    #   then this may or may not work (eval strings use the current binding to execute, not the binding of the target 
+    # This can be called in your views, and is for advanced users only.  If you are using :if / :unless eval expressions,
+    #   then this may or may not work (eval strings use the current binding to execute, not the binding of the target
     #   controller)
     def url_options_authenticate?(params = {})
       params = params.symbolize_keys
diff --git a/vendor/plugins/generators/shared_templates/role_requirement_test_helper.rb.erb b/vendor/plugins/generators/shared_templates/role_requirement_test_helper.rb.erb
index f2a3996..5f11178 100644
--- a/vendor/plugins/generators/shared_templates/role_requirement_test_helper.rb.erb
+++ b/vendor/plugins/generators/shared_templates/role_requirement_test_helper.rb.erb
@@ -12,45 +12,45 @@ module RoleRequirementTestHelper
   # Example:
   #
   #   assert_<%= users_name %>_can_access(:quentin, "index")
-  # 
+  #
   def assert_<%= users_name %>_can_access(<%= users_name %>, actions, params = {})
     assert_<%= users_name %>_access_check(true, <%= users_name %>, actions, params)
   end
-  
+
   # Makes sure a <%= users_name %> cant access the given action
   #
   # Example:
   #
   #   assert_<%= users_name %>_cant_access(:quentin, "destroy", :listing_id => 1)
-  # 
+  #
   def assert_<%= users_name %>_cant_access(<%= users_name %>, actions, params = {})
     assert_<%= users_name %>_access_check(false, <%= users_name %>, actions, params)
   end
-  
+
   # Check a list of <%= users_name.pluralize %> against a set of actions with parameters.
-  # 
+  #
   # Parameters:
   #   <%= users_name.pluralize%>_access_list - a hash where the key is the label for a fixture, and the value is a boolean.
   #   actions - a list of actions to test against
   #   params - a hash containing the parameters to pass to each test call to the controller.
-  # 
+  #
   # Example:
   #   assert_<%= users_name %>_access(
-  #     {:admin => true, :quentin => false }, 
-  #     [:show, :edit], 
+  #     {:admin => true, :quentin => false },
+  #     [:show, :edit],
   #     {:listing_id => 1})
   def assert_<%= users_name.pluralize %>_access(<%= users_name.pluralize %>_access_list, actions, params = {})
-    <%= users_name.pluralize %>_access_list.each_pair {|<%= users_name %>, access| 
+    <%= users_name.pluralize %>_access_list.each_pair {|<%= users_name %>, access|
       assert_<%= users_name %>_access_check(access, <%= users_name %>, actions, params)
     }
   end
-  
+
   alias :assert_<%= users_name %>_cannot_access :assert_<%= users_name %>_cant_access
 
 private
   def assert_<%= users_name %>_access_check(should_access, <%= users_name %>, actions, params = {})
     params = HashWithIndifferentAccess.new(params)
-    
+
     (Array===actions ? actions : [actions]).each { |action|
       # reset the controller, request, and response
       @controller = @controller.class.new
@@ -64,14 +64,14 @@ private
       end
     }
   end
-  
+
   # This is the core of the test system.
   def request_passes_role_security_system?(action, params)
     did_it_pass = false
-    
+
     action = action.to_s
     hijacker = Hijacker.new(@controller.class)
-    
+
     begin
       assert hijacker.hijack_instance_method(action, "@last_action_passed='#{action}'; render :text => 'passed'"), "unable to hijack method '#{action}'.  Are you sure the action exists?"
       get action, params
@@ -80,7 +80,7 @@ private
     ensure
       hijacker.restore
     end
-    
+
     did_it_pass = (action.to_s == assigns(:last_action_passed)) # make sure it actually made it through
   end
 end
diff --git a/vendor/plugins/javascript_auto_include/README b/vendor/plugins/javascript_auto_include/README
index 0b77996..93281e5 100644
--- a/vendor/plugins/javascript_auto_include/README
+++ b/vendor/plugins/javascript_auto_include/README
@@ -6,13 +6,13 @@ JavascriptAutoInclude
 Install
  * On rails 2.1 and above run
  script/plugin install git://github.com/kernow/javascript_auto_include.git
- 
+
 == Usage
 
  Add the following to the head of your template file
 
  <%= javascript_auto_include_tags %>
- 
+
  Now each time the template is loaded javascript files in the public/javascripts/views
  folder that correspond to the name of the current controller or view will be auto
  loaded. It's also possible for the same javascript file to be loaded by multiple views
@@ -32,7 +32,7 @@ Install
 		 show.js
 
  Assuming the above file structure loading each of the following urls would include:
- 
+
  mydomain.com/users             # includes users.js
  mydomain.com/users/edit/1      # includes users.js and edit.js
  mydomain.com/users/show/1      # includes users.js
@@ -47,7 +47,7 @@ Install
 
 http://kernowsoul.com/page/javascript_auto_include
 
-== Acknowledgements 
+== Acknowledgements
 
  Thanks to geoffgarside http://github.com/geoffgarside for also creating a version that can
  include the same file in multiple views. Some of the code comments are from his version as
diff --git a/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb b/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
index a9484a6..7b39042 100644
--- a/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
+++ b/vendor/plugins/javascript_auto_include/lib/javascript_auto_include.rb
@@ -3,27 +3,27 @@ module Helpers
     module AssetTagHelper
       # Checks for the existence of view related javaScripts and
       # includes them based on current controller and action name.
-      # 
+      #
       # Supports the following include options
       #   Given: controller_name => "users", action_name => "new"
-      # 
+      #
       # The following files will be checked for
       #   1. public/javascripts/views/users.js
       #   2. public/javascripts/views/users/new.js
       #   3. public/javascripts/views/users/new-*.js
       #   4. public/javascripts/views/users/*-new.js
       #   5. public/javascripts/views/users/*-new-*.js
-      # 
+      #
       # This allows javascript files to be shared between multiple views
       # an unlimited number of views can be stringed together e.g.
       # new-edit-index.js would be included in the new, edit, and index views
-      
+
       @@jsai_path       = "#{RAILS_ROOT}/public/javascripts/views"
       @@jsai_ext        = '.js'
       @@jsai_url        = 'views'
       @@jsai_delimiter  = '-'
       @@jsai_paths      = []
-      
+
       def javascript_auto_include_tags
         @@jsai_paths = []
         return unless File.directory? @@jsai_path
@@ -33,7 +33,7 @@ def javascript_auto_include_tags
         search_dir(controller.controller_path, controller.action_name)
         javascript_include_tag *@@jsai_paths
       end
-      
+
       private
       def search_dir(cont, action)
         dir = File.join(@@jsai_path, cont)
@@ -46,7 +46,7 @@ def search_dir(cont, action)
           end
         end
       end
-      
+
     end
   end
 end
\ No newline at end of file
diff --git a/vendor/plugins/responds_to_parent/README b/vendor/plugins/responds_to_parent/README
index 351a4e8..fd0d9c4 100644
--- a/vendor/plugins/responds_to_parent/README
+++ b/vendor/plugins/responds_to_parent/README
@@ -9,14 +9,14 @@ Example
 =======
 
 Controller:
- 
+
   class Test < ActionController::Base
     def main
     end
- 
+
     def form_action
       # Do stuff with params[:uploaded_file]
-        
+
       responds_to_parent do
         render :update do |page|
           page << "alert($('stuff').innerHTML)"
@@ -24,19 +24,19 @@ Controller:
       end
     end
   end
- 
+
 main.rhtml:
- 
+
   <html>
     <body>
       <div id="stuff">Here is some stuff</div>
- 
+
       <form target="frame" action="form_action">
         <input type="file" name="uploaded_file"/>
         <input type="submit"/>
       </form>
- 
+
       <iframe id='frame' name="frame"></iframe>
     </body>
   </html>
-  
+
diff --git a/vendor/plugins/responds_to_parent/lib/responds_to_parent.rb b/vendor/plugins/responds_to_parent/lib/responds_to_parent.rb
index 68a285d..054386d 100644
--- a/vendor/plugins/responds_to_parent/lib/responds_to_parent.rb
+++ b/vendor/plugins/responds_to_parent/lib/responds_to_parent.rb
@@ -1,23 +1,23 @@
 # Module containing the methods useful for child IFRAME to parent window communication
 module RespondsToParent
-  
+
   # Executes the response body as JavaScript in the context of the parent window.
   # Use this method of you are posting a form to a hidden IFRAME or if you would like
   # to use IFRAME base RPC.
   def responds_to_parent(&block)
     yield
-    
+
     if performed?
       # We're returning HTML instead of JS or XML now
       response.headers['Content-Type'] = 'text/html; charset=UTF-8'
-      
+
       # Either pull out a redirect or the request body
       script =  if location = erase_redirect_results
                   "document.location.href = #{location.to_s.inspect}"
                 else
                   response.body
                 end
-                
+
       # Escape quotes, linebreaks and slashes, maintaining previously escaped slashes
       # Suggestions for improvement?
       script = (script || '').
@@ -28,8 +28,8 @@ def responds_to_parent(&block)
 
       # Clear out the previous render to prevent double render
       erase_results
-      
-      # Eval in parent scope and replace document location of this frame 
+
+      # Eval in parent scope and replace document location of this frame
       # so back button doesn't replay action on targeted forms
       # loc = document.location to be set after parent is updated for IE
       # with(window.parent) - pull in variables from parent window
@@ -37,7 +37,7 @@ def responds_to_parent(&block)
       # window.eval - legal eval for Opera
       render :text => "<html><body><script type='text/javascript' charset='utf-8'>
         var loc = document.location;
-        with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) } 
+        with(window.parent) { setTimeout(function() { window.eval('#{script}'); loc.replace('about:blank'); }, 1) }
       </script></body></html>"
     end
   end
diff --git a/vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb b/vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb
index 0b45b64..ca33c8b 100644
--- a/vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb
+++ b/vendor/plugins/responds_to_parent/test/responds_to_parent_test.rb
@@ -4,46 +4,46 @@
 
 class IFrameController < ActionController::Base
   def normal
-    render :update do |page| 
+    render :update do |page|
       page.alert "foo"
     end
   end
-  
+
   def aliased
     respond_to_parent do
       render :text => 'woot'
     end
   end
-  
+
   def redirect
     responds_to_parent do
       redirect_to '/another/place'
     end
   end
-  
+
   def no_block
     responds_to_parent
   end
-  
+
   def empty_render
     responds_to_parent do
     end
-    
+
     render :text => ''
   end
-  
+
   def quotes
     responds_to_parent do
       render :text => %(single' double" qs\\' qd\\" escaped\\\' doubleescaped\\\\')
     end
   end
-  
+
   def newlines
     responds_to_parent do
       render :text => "line1\nline2\\nline2"
     end
   end
-  
+
   def update
     responds_to_parent do
       render :update do |page|
@@ -52,7 +52,7 @@ def update
       end
     end
   end
-  
+
   def rescue_action(e)
      raise e
   end
@@ -64,48 +64,48 @@ def setup
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
-  
+
   def test_normal
     get :normal
     assert_match /alert\("foo"\)/, @response.body
     assert_no_match /window\.parent/, @response.body
   end
-  
+
   def test_quotes_should_be_escaped
     render :quotes
     assert_match %r{eval\('single\\' double\\" qs\\\\\\' qd\\\\\\" escaped\\\\\\' doubleescaped\\\\\\\\\\'}, @response.body
   end
-  
+
   def test_newlines_should_be_escaped
     render :newlines
     assert_match %r{eval\('line1\\nline2\\\\nline2'\)}, @response.body
   end
-  
+
   def test_no_block_should_raise
     assert_raises LocalJumpError do
       get :no_block
     end
   end
-  
+
   def test_empty_render_should_not_expand_javascript
     get :empty_render
     assert_equal '', @response.body
   end
-  
+
   def test_update_should_perform_combined_rjs
     render :update
     assert_match /alert\(\\"foo\\"\);\\nalert\(\\"bar\\"\)/, @response.body
   end
-  
+
   def test_aliased_method_should_not_raise
     assert_nothing_raised do
       render :aliased
       assert_match /eval\('woot'\)/, @response.body
     end
   end
-  
+
 protected
-  
+
   def render(action)
     get action
     assert_match /<script type='text\/javascript'/, @response.body
diff --git a/vendor/plugins/restful_authentication/README b/vendor/plugins/restful_authentication/README
index 77438d0..6c6527d 100644
--- a/vendor/plugins/restful_authentication/README
+++ b/vendor/plugins/restful_authentication/README
@@ -1,7 +1,7 @@
 Restful Authentication Generator
 ====
 
-This is a basic restful authentication generator for rails, taken 
+This is a basic restful authentication generator for rails, taken
 from acts as authenticated.  Currently it requires Rails 1.2.6 or above.
 
 To use:
@@ -11,14 +11,14 @@ To use:
 		--stateful
 
 The first parameter specifies the model that gets created in signup
-(typically a user or account model).  A model with migration is 
+(typically a user or account model).  A model with migration is
 created, as well as a basic controller with the create method.
 
 The second parameter specifies the sessions controller name.  This is
-the controller that handles the actual login/logout function on the 
+the controller that handles the actual login/logout function on the
 site.
 
-The third parameter (--include-activation) generates the code for a 
+The third parameter (--include-activation) generates the code for a
 ActionMailer and its respective Activation Code through email.
 
 The fourth (--stateful) builds in support for acts_as_state_machine
@@ -34,18 +34,18 @@ If you're using acts_as_state_machine, define your users resource like this:
                                      :unsuspend => :put,
                                      :purge     => :delete }
 
-Also, add an observer to config/environment.rb if you chose the 
+Also, add an observer to config/environment.rb if you chose the
 --include-activation option
 
-  config.active_record.observers = :user_observer # or whatever you 
+  config.active_record.observers = :user_observer # or whatever you
 																									# named your model
 
 Security Alert
 ====
 
-I introduced a change to the model controller that's been tripping 
+I introduced a change to the model controller that's been tripping
 folks up on Rails 2.0.  The change was added as a suggestion to help
-combat session fixation attacks.  However, this resets the Form 
+combat session fixation attacks.  However, this resets the Form
 Authentication token used by Request Forgery Protection.  I've left
 it out now, since Rails 1.2.6 and Rails 2.0 will both stop session
 fixation attacks anyway.
\ No newline at end of file
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb b/vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb
index 962fb27..44a4569 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/authenticated_generator.rb
@@ -2,7 +2,7 @@
 class AuthenticatedGenerator < Rails::Generator::NamedBase
   default_options :skip_migration => false,
                   :include_activation => false
-                  
+
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
@@ -26,7 +26,7 @@ class AuthenticatedGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    
+
     @rspec = has_rspec?
 
     @controller_name = args.shift || 'sessions'
@@ -46,7 +46,7 @@ def initialize(runtime_args, runtime_options = {})
     # model controller
     base_name, @model_controller_class_path, @model_controller_file_path, @model_controller_class_nesting, @model_controller_class_nesting_depth = extract_modules(@model_controller_name)
     @model_controller_class_name_without_nesting, @model_controller_singular_name, @model_controller_plural_name = inflect_names(base_name)
-    
+
     if @model_controller_class_nesting.empty?
       @model_controller_class_name = @model_controller_class_name_without_nesting
     else
@@ -181,7 +181,7 @@ def manifest
           :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
         }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
       end
-      
+
       m.route_resource  controller_singular_name
       m.route_resources model_controller_plural_name
     end
@@ -189,7 +189,7 @@ def manifest
     action = nil
     action = $0.split("/")[1]
     case action
-      when "generate" 
+      when "generate"
         puts
         puts ("-" * 70)
         puts "Don't forget to:"
@@ -215,7 +215,7 @@ def manifest
         puts
         puts ("-" * 70)
         puts
-      when "destroy" 
+      when "destroy"
         puts
         puts ("-" * 70)
         puts
@@ -237,7 +237,7 @@ def manifest
   def has_rspec?
     options[:rspec] || (File.exist?('spec') && File.directory?('spec'))
   end
-  
+
   protected
     # Override with your own usage banner.
     def banner
@@ -247,11 +247,11 @@ def banner
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
-      opt.on("--skip-migration", 
+      opt.on("--skip-migration",
              "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
-      opt.on("--include-activation", 
+      opt.on("--include-activation",
              "Generate signup 'activation code' confirmation via email") { |v| options[:include_activation] = true }
-      opt.on("--stateful", 
+      opt.on("--stateful",
              "Use acts_as_state_machine.  Assumes --include-activation") { |v| options[:include_activation] = options[:stateful] = true }
       opt.on("--rspec",
              "Force rspec mode (checks for RAILS_ROOT/spec by default)") { |v| options[:rspec] = true }
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb
index 50f8dc5..cb03585 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/controller.rb
@@ -1,4 +1,4 @@
-# This controller handles the login/logout function of the site.  
+# This controller handles the login/logout function of the site.
 class <%= controller_class_name %>Controller < ApplicationController
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_spec.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_spec.rb
index 8c7bf0d..e10aa73 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_spec.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_spec.rb
@@ -12,7 +12,7 @@
     session[:<%= file_name %>_id].should_not be_nil
     response.should be_redirect
   end
-  
+
   it 'fails login and does not redirect' do
     post :create, :login => 'quentin', :password => 'bad password'
     session[:<%= file_name %>_id].should be_nil
@@ -30,7 +30,7 @@
     post :create, :login => 'quentin', :password => 'test', :remember_me => "1"
     response.cookies["auth_token"].should_not be_nil
   end
-  
+
   it 'does not remember me' do
     post :create, :login => 'quentin', :password => 'test', :remember_me => "0"
     response.cookies["auth_token"].should be_nil
@@ -48,7 +48,7 @@
     get :new
     controller.send(:logged_in?).should be_true
   end
-  
+
   it 'fails expired cookie login' do
     <%= table_name %>(:quentin).remember_me
     <%= table_name %>(:quentin).update_attribute :remember_token_expires_at, 5.minutes.ago
@@ -56,7 +56,7 @@
     get :new
     controller.send(:logged_in?).should_not be_true
   end
-  
+
   it 'fails cookie login' do
     <%= table_name %>(:quentin).remember_me
     request.cookies["auth_token"] = auth_token('invalid_auth_token')
@@ -67,7 +67,7 @@
   def auth_token(token)
     CGI::Cookie.new('name' => 'auth_token', 'value' => token)
   end
-    
+
   def cookie_for(<%= file_name %>)
     auth_token <%= table_name %>(<%= file_name %>).remember_token
   end
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_test.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_test.rb
index acce43b..99c886b 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_test.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/functional_test.rb
@@ -45,7 +45,7 @@ def test_should_not_remember_me
     post :create, :login => 'quentin', :password => 'test', :remember_me => "0"
     assert_nil @response.cookies["auth_token"]
   end
-  
+
   def test_should_delete_token_on_logout
     login_as :quentin
     get :destroy
@@ -78,7 +78,7 @@ def test_should_fail_cookie_login
     def auth_token(token)
       CGI::Cookie.new('name' => 'auth_token', 'value' => token)
     end
-    
+
     def cookie_for(<%= file_name %>)
       auth_token <%= table_name %>(<%= file_name %>).remember_token
     end
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb
index f6e092b..fc1072e 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/mailer.rb
@@ -7,13 +7,13 @@ def signup_notification(<%= file_name %>)
   <% else %>
     @body[:url]  = "http://YOURSITE/login/" <% end %>
   end
-  
+
   def activation(<%= file_name %>)
     setup_email(<%= file_name %>)
     @subject    += 'Your account has been activated!'
     @body[:url]  = "http://YOURSITE/"
   end
-  
+
   protected
     def setup_email(<%= file_name %>)
       @recipients  = "#{<%= file_name %>.email}"
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb
index 4f65dde..85dca93 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/model.rb
@@ -27,15 +27,15 @@ class <%= class_name %> < ActiveRecord::Base
   event :register do
     transitions :from => :passive, :to => :pending, :guard => Proc.new {|u| !(u.crypted_password.blank? && u.password.blank?) }
   end
-  
+
   event :activate do
-    transitions :from => :pending, :to => :active 
+    transitions :from => :pending, :to => :active
   end
-  
+
   event :suspend do
     transitions :from => [:passive, :pending, :active], :to => :suspended
   end
-  
+
   event :delete do
     transitions :from => [:passive, :pending, :active, :suspended], :to => :deleted
   end
@@ -66,10 +66,10 @@ def pending?
 <% end %>
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
   def self.authenticate(login, password)
-    u = <% 
+    u = <%
     if options[:stateful] %>find_in_state :first, :active, :conditions => {:login => login}<%
-    elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<% 
-    else %>find_by_login(login)<% 
+    elsif options[:include_activation] %>find :first, :conditions => ['login = ? and activated_at IS NOT NULL', login]<%
+    else %>find_by_login(login)<%
     end %> # need to get the salt
     u && u.authenticated?(password) ? u : nil
   end
@@ -89,7 +89,7 @@ def authenticated?(password)
   end
 
   def remember_token?
-    remember_token_expires_at && Time.now.utc < remember_token_expires_at 
+    remember_token_expires_at && Time.now.utc < remember_token_expires_at
   end
 
   # These create and unset the fields required for remembering users between browser closes
@@ -114,13 +114,13 @@ def forget_me
   end
 
   protected
-    # before filter 
+    # before filter
     def encrypt_password
       return if password.blank?
       self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
       self.crypted_password = encrypt(password)
     end
-      
+
     def password_required?
       crypted_password.blank? || !password.blank?
     end
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb
index 7d47b19..93a3737 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_controller.rb
@@ -13,7 +13,7 @@ def new
 
   def create
     cookies.delete :auth_token
-    # protects against session fixation attacks, wreaks havoc with 
+    # protects against session fixation attacks, wreaks havoc with
     # request forgery protection.
     # uncomment at your own risk
     # reset_session
@@ -36,12 +36,12 @@ def activate
   end
 <% end %><% if options[:stateful] %>
   def suspend
-    @<%= file_name %>.suspend! 
+    @<%= file_name %>.suspend!
     redirect_to <%= table_name %>_path
   end
 
   def unsuspend
-    @<%= file_name %>.unsuspend! 
+    @<%= file_name %>.unsuspend!
     redirect_to <%= table_name %>_path
   end
 
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_spec.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_spec.rb
index 74ea748..bc61f3d 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_spec.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_spec.rb
@@ -10,7 +10,7 @@
   it 'allows signup' do
     lambda do
       create_<%= file_name %>
-      response.should be_redirect      
+      response.should be_redirect
     end.should change(<%= class_name %>, :count).by(1)
   end
 
@@ -21,7 +21,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   it 'requires password on signup' do
     lambda do
       create_<%= file_name %>(:password => nil)
@@ -29,7 +29,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   it 'requires password confirmation on signup' do
     lambda do
       create_<%= file_name %>(:password_confirmation => nil)
@@ -45,7 +45,7 @@
       response.should be_success
     end.should_not change(<%= class_name %>, :count)
   end
-  
+
   <% if options[:include_activation] %>
   it 'activates user' do
     <%= class_name %>.authenticate('aaron', 'test').should be_nil
@@ -54,17 +54,17 @@
     flash[:notice].should_not be_nil
     <%= class_name %>.authenticate('aaron', 'test').should == <%= table_name %>(:aaron)
   end
-  
+
   it 'does not activate user without key' do
       get :activate
       flash[:notice].should be_nil
   end
-  
+
   it 'does not activate user with blank key' do
       get :activate, :activation_code => ''
       flash[:notice].should be_nil
   end<% end %>
-  
+
   def create_<%= file_name %>(options = {})
     post :create, :<%= file_name %> => { :login => 'quire', :email => 'quire@example.com',
       :password => 'quire', :password_confirmation => 'quire' }.merge(options)
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_test.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_test.rb
index 29165ae..57dce20 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_test.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/model_functional_test.rb
@@ -63,7 +63,7 @@ def test_should_activate_user
     assert_not_nil flash[:notice]
     assert_equal <%= table_name %>(:aaron), <%= class_name %>.authenticate('aaron', 'test')
   end
-  
+
   def test_should_not_activate_user_without_key
     get :activate
     assert_nil flash[:notice]
diff --git a/vendor/plugins/restful_authentication/generators/authenticated/templates/unit_spec.rb b/vendor/plugins/restful_authentication/generators/authenticated/templates/unit_spec.rb
index 312d3de..334fb86 100644
--- a/vendor/plugins/restful_authentication/generators/authenticated/templates/unit_spec.rb
+++ b/vendor/plugins/restful_authentication/generators/authenticated/templates/unit_spec.rb
@@ -6,7 +6,7 @@
 
 describe <%= class_name %> do
   fixtures :<%= table_name %>
-  
+
   it 'creates <%= file_name %>' do
     lambda do
       <%= file_name %> = create_<%= file_name %>
diff --git a/vendor/plugins/role_requirement/ChangeLog b/vendor/plugins/role_requirement/ChangeLog
index d928834..2092dda 100644
--- a/vendor/plugins/role_requirement/ChangeLog
+++ b/vendor/plugins/role_requirement/ChangeLog
@@ -1,5 +1,5 @@
 Version 1.5 - June 12, 2008
-  * bugfix - newer versions of restful_authentication return nil if no user, 
+  * bugfix - newer versions of restful_authentication return nil if no user,
     rather than :false (hurray!).  Updated generator to work accordingly
   * Add an error message if not enough arguments passed to generator, avoiding
     a common pitfall
@@ -12,10 +12,10 @@ Version 1.3.2 - November 20, 2007
   * Brought back test cases (now auto-evals the erb template to test to make sure the template for the generator is valid)
   * Increased test coverage
   * Automatically added :for and :for_all_except aliases, for more natural expressions
-  
+
 Version 1.3.1 - November 14, 2007
   * Extends "access_denied" to render a 401 error if they are logged in but not authorized
-  
+
 Version 1.3 - November 13, 2007
   * Rails 2.0 ready - Both generators tested against Rails 1.99.0
   * Generators now generate RoleRequirementSystem and RoleRequirementTestHelper.  Automatically places RoleRequirementTestHelper include in test_helper.rb
diff --git a/vendor/plugins/role_requirement/README.textile b/vendor/plugins/role_requirement/README.textile
index 806ce4c..71bd611 100644
--- a/vendor/plugins/role_requirement/README.textile
+++ b/vendor/plugins/role_requirement/README.textile
@@ -23,7 +23,7 @@ role_requirement accepts several methods as an options hash of key/value pairs.
 These methods can be thought of as telling role_requirement when to evaluate current_user's roles.
 
 <pre><code>
-  # Anytime an action is called, require the role admin in order to execute, 
+  # Anytime an action is called, require the role admin in order to execute,
   # EXCEPT when index is called.  So, index passes through this require_role
   # line allowing anyone to access it, ALL other actions are evaluated against
   # the specified role(s).
@@ -62,7 +62,7 @@ Each line serves as an additional requirement to any other lines in the controll
   # required only for index.
   # The controller always requires admin and requires executive only when
   # index is called. Useful for allowing only executive to call certain, more
-  # restricted, actions, for example. 
+  # restricted, actions, for example.
 </code></pre>
 
 h2. Passing Arrays
@@ -124,14 +124,14 @@ If you use strings as keys for the options hash, it will throw an error. ie:
   require_role "admin", :only => "index"
 </code></pre>
 
-RoleRequirement does not care if the values are symbols or strings, regarding action names. 
+RoleRequirement does not care if the values are symbols or strings, regarding action names.
 
 <pre><code>
   require_role "admin", :only => "index"
   require_role "admin", :only => :index
 </code></pre>
 
-Roles are passed to User#has_role? exactly as specified.  By default, RoleRequirement generates this method to not care.  If you customize User#has_role? in such a way that it does care, then you'll have problems. 
+Roles are passed to User#has_role? exactly as specified.  By default, RoleRequirement generates this method to not care.  If you customize User#has_role? in such a way that it does care, then you'll have problems.
 
 <pre><code>
   # ultimately calls User#has_role?("admin")
diff --git a/vendor/plugins/role_requirement/generators/role_generator_helpers.rb b/vendor/plugins/role_requirement/generators/role_generator_helpers.rb
index e2377bb..475df0c 100644
--- a/vendor/plugins/role_requirement/generators/role_generator_helpers.rb
+++ b/vendor/plugins/role_requirement/generators/role_generator_helpers.rb
@@ -7,15 +7,15 @@ def insert_content_after(filename, regexp, content_for_insertion, options = {})
       # find the line that has the model declaration
       lines = content.split("\n")
       found_line = nil
-      
-      0.upto(lines.length-1) {|line_number| 
+
+      0.upto(lines.length-1) {|line_number|
         found_line = line_number if regexp.match(lines[line_number])
       }
       if found_line
         # insert the rest of these lines after the found line
         lines.insert(found_line+1, content_for_insertion)
         content = lines * "\n"
-        
+
         File.open(filename, "w") {|f| f.puts content }
         return true
       end
@@ -23,7 +23,7 @@ def insert_content_after(filename, regexp, content_for_insertion, options = {})
       return false
     end
   end
-  
+
   def add_role_requirement_system(m)
     m.template 'role_requirement_system.rb.erb',
           File.join('lib', "role_requirement_system.rb")
@@ -32,17 +32,17 @@ def add_role_requirement_system(m)
     m.template 'hijacker.rb',
           File.join('lib', "hijacker.rb")
   end
-  
+
   def add_dependencies_to_test_helper_rb
     app_filename = "#{RAILS_ROOT}/test/test_helper.rb"
-    
+
     test_helper_content = <<EOF
   # RoleRequirementTestHelper must be included to test RoleRequirement
   include RoleRequirementTestHelper
 EOF
     insert_content_after(
-      app_filename, 
-      /class +Test::Unit::TestCase/, 
+      app_filename,
+      /class +Test::Unit::TestCase/,
       test_helper_content,
       :unless => lambda {|content| /include +RoleRequirementTestHelper/.match(content) }
     ) && puts("Added RoleRequirementTestHelper include to #{app_filename}")
@@ -50,35 +50,35 @@ def add_dependencies_to_test_helper_rb
 
   def add_dependencies_to_application_rb
     app_filename = "#{RAILS_ROOT}/app/controllers/application.rb"
-    
+
     auth_system_content = <<EOF
   # AuthenticatedSystem must be included for RoleRequirement, and is provided by installing acts_as_authenticates and running 'script/generate authenticated account user'.
   include AuthenticatedSystem
 EOF
-    
+
     role_requirement_content = <<EOF
   # You can move this into a different controller, if you wish.  This module gives you the require_role helpers, and others.
   include RoleRequirementSystem
 EOF
 
     insert_content_after(
-      app_filename, 
-      /class +ApplicationController/, 
+      app_filename,
+      /class +ApplicationController/,
       auth_system_content,
       :unless => lambda {|content| /include +AuthenticatedSystem/.match(content) }
     ) && puts("Added ApplicationController include to #{app_filename}")
-    
+
     insert_content_after(
-      app_filename, 
-      /include +AuthenticatedSystem/, 
+      app_filename,
+      /include +AuthenticatedSystem/,
       role_requirement_content,
       :unless => lambda {|content| /include +RoleRequirementSystem/.match(content) }
     ) && puts("Added RoleRequirement include to #{app_filename}")
-    
+
   end
-  
+
   def users_model_filename;  "app/models/#{users_model_name.underscore}.rb"; end;
-    
+
   def users_name;  "#{users_model_name.downcase}"; end;
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/role_requirement/generators/roles/roles_generator.rb b/vendor/plugins/role_requirement/generators/roles/roles_generator.rb
index d023b59..463359f 100644
--- a/vendor/plugins/role_requirement/generators/roles/roles_generator.rb
+++ b/vendor/plugins/role_requirement/generators/roles/roles_generator.rb
@@ -1,15 +1,15 @@
 require( File.join( File.dirname(__FILE__), "../role_generator_helpers" ))
 
 class RolesGenerator < Rails::Generator::NamedBase
-  
+
   include RoleGeneratorHelpers
-  
-  attr_accessor :roles_model_name, 
-                :roles_table_name, 
-                :users_table_name, 
+
+  attr_accessor :roles_model_name,
+                :roles_table_name,
+                :users_table_name,
                 :users_model_name,
                 :next_user_id
-      
+
   def initialize(runtime_args, runtime_options = {})
     super
     unless runtime_args.length == 2
@@ -17,22 +17,22 @@ def initialize(runtime_args, runtime_options = {})
       puts "Expected: script/generate roles [Role] [User]"
       exit
     end
-    
+
     @roles_model_name = (runtime_args[0] || "Role").classify
     @users_model_name = (runtime_args[1] || "User").classify
     @roles_table_name = @roles_model_name.tableize
     @users_table_name = @users_model_name.tableize
-    
+
     puts "Generating #{@roles_model_name} against #{@users_model_name}"
   end
-  
+
   def manifest
     record do |m|
       modify_or_add_user_fixtures(m)
       add_roles_and_join_table_fixtures(m)
-      
+
       add_method_to_user_model(m)
-      
+
       add_role_model(m)
       add_dependencies_to_application_rb
       add_dependencies_to_test_helper_rb
@@ -40,12 +40,12 @@ def manifest
       add_migration(m) unless options[:skip_migration]
     end
   end
-  
+
   def add_role_model(m)
     # add the Role model
     m.template 'role_model.rb.erb', roles_model_filename
   end
-  
+
   def add_method_to_user_model(m)
     content_for_insertion = render_template("_user_functions.erb")
     # modify the User model unless it's already got RoleRequirement code in there
@@ -59,19 +59,19 @@ def add_method_to_user_model(m)
       puts "Not modifying #{users_model_filename} because it appears that the funtion has_role? already exists."
     end
   end
-    
+
   def modify_or_add_user_fixtures(m)
     if (File.exists?(users_fixture_filename))
       users_fixtures_content = File.read users_fixture_filename
       users_fixtures = YAML.load(users_fixtures_content)
-      
+
       begin
         throw "Can't understand whatever is in #{users_fixture_filename}" unless Hash===users_fixtures
-        
+
         unless users_fixtures.has_key?("admin")
           @next_user_id = (users_fixtures.collect{ |k, params| params["id"].to_i}.max||0) + 1
           output = users_fixtures_content + "\n" + render_template("users_admin_fixture_with_roles.yml")
-          
+
           # prevent generator from truncating the whole file if something goes wrong.
           if output.length > users_fixtures_content.length
             File.open(users_fixture_filename, "w") {|f| f.write(output) }
@@ -85,31 +85,31 @@ def modify_or_add_user_fixtures(m)
     else
       # users.yml doesn't exist.  Generate it from scratch
       @next_user_id = 1
-      
+
       m.template 'users_admin_fixture_with_roles.yml',
         File.join('test/fixtures', "#{users_table_name}.yml")
     end
 
   end
-  
+
   def add_migration(m)
     m.migration_template '001_roles_migration.rb.erb', 'db/migrate', :assigns => {
       :migration_name => "Create#{roles_model_name.pluralize.gsub(/::/, '')}"
     }, :migration_file_name => "create_#{roles_table_name}"
   end
-  
+
   def add_roles_and_join_table_fixtures(m)
     m.template 'roles_users.yml',
               File.join('test/fixtures', "#{habtm_name}.yml")
     m.template 'roles.yml',
               File.join('test/fixtures', "#{roles_table_name}.yml")
   end
-  
+
   def render_template(name)
     template = File.read( File.join( File.dirname(__FILE__), "templates", name))
     ERB.new(template, nil, "-").result(binding)
   end
-  
+
   def habtm_name;       [roles_table_name, users_table_name].sort * "_"; end
   def roles_foreign_key; roles_table_name.singularize.foreign_key; end
   def roles_model_filename;  "app/models/#{roles_model_name.underscore}.rb"; end;
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/001_roles_migration.rb.erb b/vendor/plugins/role_requirement/generators/roles/templates/001_roles_migration.rb.erb
index 3d4050c..17f2bc9 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/001_roles_migration.rb.erb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/001_roles_migration.rb.erb
@@ -3,7 +3,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     create_table "<%= roles_table_name %>" do |t|
       t.string :name
     end
-    
+
     # generate the join table
     create_table "<%= habtm_name %>", :id => false do |t|
       t.integer "<%= roles_foreign_key %>", "<%= users_foreign_key %>"
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/_user_functions.erb b/vendor/plugins/role_requirement/generators/roles/templates/_user_functions.erb
index 0a29a58..fec0ccc 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/_user_functions.erb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/_user_functions.erb
@@ -1,12 +1,12 @@
-  
-  
-  
+
+
+
   # ---------------------------------------
   # The following code has been generated by role_requirement.
   # You may wish to modify it to suit your need
   has_and_belongs_to_many :<%=roles_table_name%>
-  
-  # has_role? simply needs to return true or false whether a user has a role or not.  
+
+  # has_role? simply needs to return true or false whether a user has a role or not.
   # It may be a good idea to have "admin" roles return true always
   def has_role?(role_in_question)
     @<%roles_table_name%>_list ||= self.<%=roles_table_name%>.collect(&:name)
@@ -14,7 +14,6 @@
     (@<%roles_table_name%>_list.include?(role_in_question.to_s) )
   end
   # ---------------------------------------
-  
-  
-  
-  
\ No newline at end of file
+
+
+
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/hijacker.rb b/vendor/plugins/role_requirement/generators/roles/templates/hijacker.rb
index 1d5bc5e..86a3627 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/hijacker.rb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/hijacker.rb
@@ -13,19 +13,19 @@ def initialize(klass)
     @target_klass = klass
     @method_stores = {}
   end
-  
+
   def hijack_class_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(class_self_instance, method_name, eval_string, arg_names, &block )
   end
-  
+
   def hijack_instance_method(method_name, eval_string = nil, arg_names = [], &block)
     hijack_method(@target_klass, method_name, eval_string, arg_names, &block )
   end
-  
-  # restore all 
+
+  # restore all
   def restore
     @method_stores.each_pair{|klass, method_stores|
-      method_stores.reverse_each{ |method_name, method| 
+      method_stores.reverse_each{ |method_name, method|
         klass.send :undef_method, method_name
         klass.send :define_method, method_name, method if method
       }
@@ -35,27 +35,27 @@ def restore
   rescue
     false
   end
-  
-protected  
+
+protected
 
   def class_self_instance
     @target_klass.send :eval, "class << self; self; end;"
   end
-  
+
   def hijack_method(klass, method_name, eval_string = nil, arg_names = [], &block)
     method_name = method_name.to_s
-    # You have got love ruby!  What other language allows you to pillage and plunder a class like this? 
-    
+    # You have got love ruby!  What other language allows you to pillage and plunder a class like this?
+
     (@method_stores[klass]||=[]) << [
-      method_name, 
+      method_name,
       klass.instance_methods.include?(method_name) && klass.instance_method(method_name)
     ]
-    
+
     klass.send :undef_method, method_name
     if Symbol === eval_string
       klass.send :define_method, method_name, klass.instance_methods(eval_string)
     elsif String === eval_string
-      klass.class_eval <<-EOF 
+      klass.class_eval <<-EOF
         def #{method_name}(#{arg_names * ','})
           #{eval_string}
         end
@@ -63,10 +63,10 @@ def #{method_name}(#{arg_names * ','})
     elsif block_given?
       klass.send :define_method, method_name, block
     end
-    
+
     true
   rescue
     false
   end
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/role_model.rb.erb b/vendor/plugins/role_requirement/generators/roles/templates/role_model.rb.erb
index 254ceb1..7085253 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/role_model.rb.erb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/role_model.rb.erb
@@ -1,3 +1,3 @@
 class <%= class_name %> < ActiveRecord::Base
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_system.rb.erb b/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_system.rb.erb
index 611c335..800cdf2 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_system.rb.erb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_system.rb.erb
@@ -1,4 +1,4 @@
-# Main module for authentication.  
+# Main module for authentication.
 # Include this in ApplicationController to activate RoleRequirement
 #
 # See RoleSecurityClassMethods for some methods it provides.
@@ -7,21 +7,21 @@ module RoleRequirementSystem
     klass.send :class_inheritable_array, :role_requirements
     klass.send :include, RoleSecurityInstanceMethods
     klass.send :extend, RoleSecurityClassMethods
-    klass.send :helper_method, :url_options_authenticate? 
-    
+    klass.send :helper_method, :url_options_authenticate?
+
     klass.send :role_requirements=, []
-    
+
   end
-  
+
   module RoleSecurityClassMethods
-    
+
     def reset_role_requirements!
       self.role_requirements.clear
     end
-    
+
     # Add this to the top of your controller to require a role in order to access it.
     # Example Usage:
-    # 
+    #
     #    require_role "contractor"
     #    require_role "admin", :only => :destroy # don't allow contractors to destroy
     #    require_role "admin", :only => :update, :unless => "current_<%= users_name %>.authorized_for_listing?(params[:id]) "
@@ -29,40 +29,40 @@ module RoleRequirementSystem
     # Valid options
     #
     #  * :only - Only require the role for the given actions
-    #  * :except - Require the role for everything but 
+    #  * :except - Require the role for everything but
     #  * :if - a Proc or a string to evaluate.  If it evaluates to true, the role is required.
     #  * :unless - The inverse of :if
-    #    
+    #
     def require_role(roles, options = {})
       options.assert_valid_keys(:if, :unless,
-        :for, :only, 
+        :for, :only,
         :for_all_except, :except
       )
-      
+
       # only declare that before filter once
       unless (@before_filter_declared||=false)
         @before_filter_declared=true
         before_filter :check_roles
       end
-      
+
       # convert to an array if it isn't already
       roles = [roles] unless Array===roles
-      
+
       options[:only] ||= options[:for] if options[:for]
       options[:except] ||= options[:for_all_except] if options[:for_all_except]
-      
+
       # convert any actions into symbols
       for key in [:only, :except]
         if options.has_key?(key)
           options[key] = [options[key]] unless Array === options[key]
           options[key] = options[key].compact.collect{|v| v.to_sym}
-        end 
+        end
       end
-      
+
       self.role_requirements||=[]
       self.role_requirements << {:roles => roles, :options => options }
     end
-    
+
     # This is the core of RoleRequirement.  Here is where it discerns if a <%= users_name %> can access a controller or not./
     def <%= users_name %>_authorized_for?(<%= users_name %>, params = {}, binding = self.binding)
       return true unless Array===self.role_requirements
@@ -70,44 +70,44 @@ module RoleRequirementSystem
         roles = role_requirement[:roles]
         options = role_requirement[:options]
         # do the options match the params?
-        
+
         # check the action
         if options.has_key?(:only)
           next unless options[:only].include?( (params[:action]||"index").to_sym )
         end
-        
+
         if options.has_key?(:except)
           next if options[:except].include?( (params[:action]||"index").to_sym)
         end
-        
+
         if options.has_key?(:if)
           # execute the proc.  if the procedure returns false, we don't need to authenticate these roles
           next unless ( String===options[:if] ? eval(options[:if], binding) : options[:if].call(params) )
         end
-        
+
         if options.has_key?(:unless)
           # execute the proc.  if the procedure returns true, we don't need to authenticate these roles
           next if ( String===options[:unless] ? eval(options[:unless], binding) : options[:unless].call(params) )
         end
-        
+
         # check to see if they have one of the required roles
         passed = false
         roles.each { |role|
           passed = true if <%= users_name %>.has_role?(role)
         } unless (! <%= users_name %> || <%= users_name %>==:false)
-        
+
         return false unless passed
       }
-      
+
       return true
     end
   end
-  
+
   module RoleSecurityInstanceMethods
     def self.included(klass)
       raise "Because role_requirement extends acts_as_authenticated, You must include AuthenticatedSystem first before including RoleRequirementSystem!" unless klass.included_modules.include?(AuthenticatedSystem)
     end
-    
+
     def access_denied
       if logged_in?
         render :nothing => true, :status => 401
@@ -116,17 +116,17 @@ module RoleRequirementSystem
         super
       end
     end
-    
-    def check_roles       
+
+    def check_roles
       return access_denied unless self.class.<%= users_name %>_authorized_for?(current_<%= users_name %>, params, binding)
-      
+
       true
     end
-    
+
   protected
     # receives a :controller, :action, and :params.  Finds the given controller and runs <%= users_name %>_authorized_for? on it.
-    # This can be called in your views, and is for advanced users only.  If you are using :if / :unless eval expressions, 
-    #   then this may or may not work (eval strings use the current binding to execute, not the binding of the target 
+    # This can be called in your views, and is for advanced users only.  If you are using :if / :unless eval expressions,
+    #   then this may or may not work (eval strings use the current binding to execute, not the binding of the target
     #   controller)
     def url_options_authenticate?(params = {})
       params = params.symbolize_keys
diff --git a/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_test_helper.rb.erb b/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_test_helper.rb.erb
index f2a3996..5f11178 100644
--- a/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_test_helper.rb.erb
+++ b/vendor/plugins/role_requirement/generators/roles/templates/role_requirement_test_helper.rb.erb
@@ -12,45 +12,45 @@ module RoleRequirementTestHelper
   # Example:
   #
   #   assert_<%= users_name %>_can_access(:quentin, "index")
-  # 
+  #
   def assert_<%= users_name %>_can_access(<%= users_name %>, actions, params = {})
     assert_<%= users_name %>_access_check(true, <%= users_name %>, actions, params)
   end
-  
+
   # Makes sure a <%= users_name %> cant access the given action
   #
   # Example:
   #
   #   assert_<%= users_name %>_cant_access(:quentin, "destroy", :listing_id => 1)
-  # 
+  #
   def assert_<%= users_name %>_cant_access(<%= users_name %>, actions, params = {})
     assert_<%= users_name %>_access_check(false, <%= users_name %>, actions, params)
   end
-  
+
   # Check a list of <%= users_name.pluralize %> against a set of actions with parameters.
-  # 
+  #
   # Parameters:
   #   <%= users_name.pluralize%>_access_list - a hash where the key is the label for a fixture, and the value is a boolean.
   #   actions - a list of actions to test against
   #   params - a hash containing the parameters to pass to each test call to the controller.
-  # 
+  #
   # Example:
   #   assert_<%= users_name %>_access(
-  #     {:admin => true, :quentin => false }, 
-  #     [:show, :edit], 
+  #     {:admin => true, :quentin => false },
+  #     [:show, :edit],
   #     {:listing_id => 1})
   def assert_<%= users_name.pluralize %>_access(<%= users_name.pluralize %>_access_list, actions, params = {})
-    <%= users_name.pluralize %>_access_list.each_pair {|<%= users_name %>, access| 
+    <%= users_name.pluralize %>_access_list.each_pair {|<%= users_name %>, access|
       assert_<%= users_name %>_access_check(access, <%= users_name %>, actions, params)
     }
   end
-  
+
   alias :assert_<%= users_name %>_cannot_access :assert_<%= users_name %>_cant_access
 
 private
   def assert_<%= users_name %>_access_check(should_access, <%= users_name %>, actions, params = {})
     params = HashWithIndifferentAccess.new(params)
-    
+
     (Array===actions ? actions : [actions]).each { |action|
       # reset the controller, request, and response
       @controller = @controller.class.new
@@ -64,14 +64,14 @@ private
       end
     }
   end
-  
+
   # This is the core of the test system.
   def request_passes_role_security_system?(action, params)
     did_it_pass = false
-    
+
     action = action.to_s
     hijacker = Hijacker.new(@controller.class)
-    
+
     begin
       assert hijacker.hijack_instance_method(action, "@last_action_passed='#{action}'; render :text => 'passed'"), "unable to hijack method '#{action}'.  Are you sure the action exists?"
       get action, params
@@ -80,7 +80,7 @@ private
     ensure
       hijacker.restore
     end
-    
+
     did_it_pass = (action.to_s == assigns(:last_action_passed)) # make sure it actually made it through
   end
 end
diff --git a/vendor/plugins/role_requirement/test/authenticated_system.rb b/vendor/plugins/role_requirement/test/authenticated_system.rb
index e5be9d1..6837aa8 100644
--- a/vendor/plugins/role_requirement/test/authenticated_system.rb
+++ b/vendor/plugins/role_requirement/test/authenticated_system.rb
@@ -5,18 +5,18 @@ module AuthenticatedSystem
     def logged_in?
       current_user != :false
     end
-    
+
     # Accesses the current user from the session.
     def current_user
       @current_user ||= (@current_user && User.find_by_id(@current_user)) || :false
     end
-    
+
     # Store the given user in the session.
     def current_user=(new_user)
       @current_user = (new_user.nil? || new_user.is_a?(Symbol)) ? nil : new_user.id
       @current_user = new_user
     end
-    
+
     # Check if the user is authorized.
     #
     # Override this method in your controllers if you want to restrict access
@@ -52,7 +52,7 @@ def login_required
       self.current_user ||= User.authenticate(username, passwd) || :false if username && passwd
       logged_in? && authorized? ? true : access_denied
     end
-    
+
     # Redirect as appropriate when an access request fails.
     #
     # The default action is to redirect to the login screen.
@@ -65,22 +65,22 @@ def access_denied
       store_location
       redirect_to :controller => '/account', :action => 'login'
       false
-    end  
-    
+    end
+
     # Store the URI of the current request in the session.
     #
     # We can return to this location by calling #redirect_back_or_default.
     def store_location
       @location_stored = true
     end
-    
+
     # Redirect to the URI stored by the most recent store_location call or
     # to the passed default.
     def redirect_back_or_default(default)
       session[:return_to] ? redirect_to_url(session[:return_to]) : redirect_to(default)
       session[:return_to] = nil
     end
-    
+
     # Inclusion hook to make #current_user and #logged_in?
     # available as ActionView helper methods.
     def self.included(base)
@@ -106,6 +106,6 @@ def login_from_cookie
     def get_auth_data
       auth_key  = @@http_auth_headers.detect { |h| request.env.has_key?(h) }
       auth_data = request.env[auth_key].to_s.split unless auth_key.blank?
-      return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil] 
+      return auth_data && auth_data[0] == 'Basic' ? Base64.decode64(auth_data[1]).split(':')[0..1] : [nil, nil]
     end
 end
diff --git a/vendor/plugins/role_requirement/test/controller_stub.rb b/vendor/plugins/role_requirement/test/controller_stub.rb
index 9403cf8..e56ab28 100644
--- a/vendor/plugins/role_requirement/test/controller_stub.rb
+++ b/vendor/plugins/role_requirement/test/controller_stub.rb
@@ -1,20 +1,20 @@
 class ControllerStub
-  
+
   attr_writer :params
   def params
     @params||{}
   end
-  
-  attr_accessor :current_user 
-  
-  
-  
+
+  attr_accessor :current_user
+
+
+
   def self.before_filter(*args)
   end
 
   def self.helper_method(*args)
   end
-#  
+#
 #  def access_denied
 #    false
 #  end
@@ -23,7 +23,7 @@ def self.helper_method(*args)
   def render(*params)
     @render_params = params
   end
-  
+
   attr_accessor :redirect_to_params
   def redirect_to(*redirect_to_params)
     @redirect_to_params = redirect_to_params
diff --git a/vendor/plugins/role_requirement/test/functional/test_role_controller.rb b/vendor/plugins/role_requirement/test/functional/test_role_controller.rb
index fda9929..e5378b3 100644
--- a/vendor/plugins/role_requirement/test/functional/test_role_controller.rb
+++ b/vendor/plugins/role_requirement/test/functional/test_role_controller.rb
@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper.rb')
 
-class MyController < ControllerStub 
+class MyController < ControllerStub
   include AuthenticatedSystem
   include RoleRequirementSystem
 end
@@ -14,91 +14,91 @@ class TestRoleController < Test::Unit::TestCase
   def setup
     MyController.reset_role_requirements!
     OtherController.reset_role_requirements!
-    
+
     @controller = MyController.new
   end
-  
+
   def test__required_role_for_all__should_require
     @controller.class.require_role "admin"
     set_roles ""
-    
+
     assert(!@controller.check_roles)
 
     @controller.current_user = User.new(:roles => "admin")
     assert(@controller.check_roles)
   end
-  
+
   def test_required_role_for_some_actions_only__should_require
     require_role "admin", :only => [:update, :destroy, :delete]
     set_roles ""
-    
+
     @controller.params = {:action => "update" }
     assert(!@controller.check_roles, "shouldn't pass")
-    
+
     @controller.params = {:action => "index" }
     assert(@controller.check_roles, "should pass")
   end
-  
+
   def test__for_alias
     require_role "admin", :for => [:update, :destroy, :delete]
-    
+
     set_roles ""
     assert_fails_with :action => "update"
     assert_passes_with :action => "index"
   end
-  
+
   def test__for_all_except_alias
     require_role "admin", :for_all_except => [:index]
-    
+
     set_roles ""
     assert_fails_with :action => "update"
     assert_passes_with :action => "index"
   end
-  
+
   def test_required_role_for_excluded_actions_only__should_require
     require_role "admin", :except => :index
     set_roles ""
-    
+
     @controller.params = {:action => "update" }
     assert(!@controller.check_roles, "shouldn't pass")
-    
+
     @controller.params = {:action => "index" }
     assert(@controller.check_roles, "should pass")
   end
-  
+
   def test__no_user__role_required__returns_false
     @controller.class.require_role "admin"
     @controller.current_user = nil
-    
+
     @controller.params = {:action => "destroy" }
     assert(!@controller.check_roles, "shouldnt pass")
   end
-  
+
   def test__no_user__role_not_required__returns_true
     @controller.class.require_role "admin", :except => :index
     @controller.current_user = nil
-    
+
     @controller.params = {:action => "index" }
     assert(@controller.check_roles, "should pass")
   end
-  
-  
+
+
   def test_required_role_for_if_proc__should_require
     @controller.class.require_role "admin", :only => :list, :if => Proc.new {|params| params[:status] == "completed" }
     set_roles ""
-    
+
     @controller.params = {:action => "list", :status => "pending" }
     assert(@controller.check_roles, "should pass")
-    
+
     @controller.params = {:action => "list", :status => "completed" }
     assert(!@controller.check_roles, "shouldn't pass")
   end
-  
+
   def test__controllers_dont_share_requirements
     @controller2 = OtherController.new
     @controller2.class.require_role "user"
     @controller2.send :current_user=, User.new(:roles => "user")
-    
+
     @controller.class.require_role "admin"
     @controller.current_user = User.new(:roles => "admin")
     assert(@controller.check_roles, "should pass")
@@ -109,26 +109,26 @@ def test__controllers_dont_share_requirements
     assert(!@controller.check_roles, "shouldn't pass")
     assert(!@controller2.check_roles, "shouldn't pass")
   end
-  
+
   def test__url_options_authenticate
     MyController.require_role "admin", :only => :destroy
     OtherController.require_role "admin", :only => :destroy
-    
+
     set_roles ""
-    
+
     assert ! @controller.send(:url_options_authenticate?, { :controller => :my, :action => "destroy" } ), "shouldn't pass"
     assert ! @controller.send(:url_options_authenticate?, { :controller => :other, :action => "destroy" } ), "shouldn't pass"
-    
+
     assert @controller.send(:url_options_authenticate?, { :controller => :my, :action => "index" } ), "should pass"
     assert @controller.send(:url_options_authenticate?, { :controller => :other, :action => "index" } ), "should pass"
   end
-  
+
   def test__url_options_authenticate__nil_value__should_handle
     assert_nothing_raised do
       @controller.send(:url_options_authenticate?, { :controller => :my } )
     end
   end
-  
+
   def test__url_options_authenticate__nil_value__should_treat_as_index
     MyController.require_role "admin", :only => :index
     set_roles ""
@@ -136,40 +136,40 @@ def test__url_options_authenticate__nil_value__should_treat_as_index
     assert ! @controller.send(:url_options_authenticate?, { :controller => :my } ), "shouldn't pass"
     assert @controller.send(:url_options_authenticate?, { :controller => :my, :action => "destroy" } ), "should pass"
   end
-  
+
   def test__url_options_authenticate__no_controller__assumes_self
     MyController.require_role "admin", :only => :index
     set_roles ""
 
     assert ! @controller.send(:url_options_authenticate?, { :action => "index" } ), "shouldn't pass"
     assert @controller.send(:url_options_authenticate?, { :action => "boogy" } ), "shouldn't pass"
-  
+
   end
 
 protected
   def require_role(*params)
     @controller.class.require_role(*params)
   end
-  
+
   def reset_role_requirements!
     @controller.class.reset_role_requirements!
   end
-  
+
   def set_roles(roles = "")
     @controller.current_user = User.new(:roles => roles)
   end
-  
+
   def passes_with_params?(params = {})
     @controller.params = params
     @controller.check_roles
   end
-  
+
   def assert_passes_with(params = {})
     assert passes_with_params?(params), "should pass"
   end
-  
+
   def assert_fails_with(params = {})
     assert ! passes_with_params?(params), "should pass"
   end
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/role_requirement/test/test_helper.rb b/vendor/plugins/role_requirement/test/test_helper.rb
index 699a93c..faba558 100644
--- a/vendor/plugins/role_requirement/test/test_helper.rb
+++ b/vendor/plugins/role_requirement/test/test_helper.rb
@@ -16,7 +16,7 @@ def include_rendered_template(abs_name, locals = {})
 end
 
 include_rendered_template(
-  File.join( File.dirname(__FILE__), "../generators/roles/templates/role_requirement_system.rb.erb"), 
+  File.join( File.dirname(__FILE__), "../generators/roles/templates/role_requirement_system.rb.erb"),
   {:users_name => "user" }
 )
 
diff --git a/vendor/plugins/role_requirement/test/user_stub.rb b/vendor/plugins/role_requirement/test/user_stub.rb
index 664b95a..a324ae7 100644
--- a/vendor/plugins/role_requirement/test/user_stub.rb
+++ b/vendor/plugins/role_requirement/test/user_stub.rb
@@ -1,30 +1,30 @@
 class User
   attr_accessor :roles
-  
+
   def id
     1
   end
-  
+
   def initialize(params = {})
     self.roles = params[:roles]
   end
-  
+
   def has_role?(role)
     return @roles.include?(role)
   rescue
     false
   end
-  
+
   attr_reader :roles
-  
+
   def roles=(value)
     if Array===value
-      @roles = value 
+      @roles = value
     elsif String===value
       @roles = value.split(",")
     else
       @roles = nil
     end
   end
-  
+
 end
\ No newline at end of file
diff --git a/vendor/plugins/ssl_requirement/README b/vendor/plugins/ssl_requirement/README
index afe5a84..a31086f 100644
--- a/vendor/plugins/ssl_requirement/README
+++ b/vendor/plugins/ssl_requirement/README
@@ -14,11 +14,11 @@ Example:
   class AccountController < ApplicationController
     ssl_required :signup, :payment
     ssl_allowed :index
-    
+
     def signup
       # Non-SSL access will be redirected to SSL
     end
-    
+
     def payment
       # Non-SSL access will be redirected to SSL
     end
@@ -31,7 +31,7 @@ Example:
       # SSL access will be redirected to non-SSL
     end
   end
-  
+
 You can overwrite the protected method ssl_required? to rely on other things
 than just the declarative specification. Say, only premium accounts get SSL.
 
diff --git a/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb b/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
index dd4a345..83a3443 100644
--- a/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
+++ b/vendor/plugins/ssl_requirement/lib/ssl_requirement.rb
@@ -34,13 +34,13 @@ def ssl_allowed(*actions)
       write_inheritable_array(:ssl_allowed_actions, actions)
     end
   end
-  
+
   protected
     # Returns true if the current action is supposed to run as SSL
     def ssl_required?
       (self.class.read_inheritable_attribute(:ssl_required_actions) || []).include?(action_name.to_sym)
     end
-    
+
     def ssl_allowed?
       (self.class.read_inheritable_attribute(:ssl_allowed_actions) || []).include?(action_name.to_sym)
     end
diff --git a/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb b/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
index 0dc67ed..d45d3a6 100644
--- a/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
+++ b/vendor/plugins/ssl_requirement/test/ssl_requirement_test.rb
@@ -25,26 +25,26 @@
 
 class SslRequirementController < ActionController::Base
   include SslRequirement
-  
+
   ssl_required :a, :b
   ssl_allowed :c
-  
+
   def a
     render :nothing => true
   end
-  
+
   def b
     render :nothing => true
   end
-  
+
   def c
     render :nothing => true
   end
-  
+
   def d
     render :nothing => true
   end
-  
+
   def set_flash
     flash[:foo] = "bar"
   end
@@ -56,21 +56,21 @@ def setup
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
-  
+
   def test_redirect_to_https_preserves_flash
     get :set_flash
     get :b
     assert_response :redirect
     assert_equal "bar", flash[:foo]
   end
-  
+
   def test_not_redirecting_to_https_does_not_preserve_the_flash
     get :set_flash
     get :d
     assert_response :success
     assert_nil flash[:foo]
   end
-  
+
   def test_redirect_to_http_preserves_flash
     get :set_flash
     @request.env['HTTPS'] = "on"
@@ -78,7 +78,7 @@ def test_redirect_to_http_preserves_flash
     assert_response :redirect
     assert_equal "bar", flash[:foo]
   end
-  
+
   def test_not_redirecting_to_http_does_not_preserve_the_flash
     get :set_flash
     @request.env['HTTPS'] = "on"
@@ -86,7 +86,7 @@ def test_not_redirecting_to_http_does_not_preserve_the_flash
     assert_response :success
     assert_nil flash[:foo]
   end
-  
+
   def test_required_without_ssl
     assert_not_equal "on", @request.env["HTTPS"]
     get :a
@@ -96,7 +96,7 @@ def test_required_without_ssl
     assert_response :redirect
     assert_match %r{^https://}, @response.headers['Location']
   end
-  
+
   def test_required_with_ssl
     @request.env['HTTPS'] = "on"
     get :a