Merge branch 'master' into theming

Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'rails', '= 3.2.17'
+gem 'rails', '= 3.2.18'
 gem 'mysql2', '> 0.3'
 
 # Needed for the new asset pipeline

Gemfile.lock

@@ -1,12 +1,12 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.2.17)
-      actionpack (= 3.2.17)
+    actionmailer (3.2.18)
+      actionpack (= 3.2.18)
       mail (~> 2.5.4)
-    actionpack (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
@@ -26,18 +26,18 @@ GEM
       meta_search (>= 0.9.2)
       rails (>= 3.0.0)
       sass (>= 3.1.0)
-    activemodel (3.2.17)
-      activesupport (= 3.2.17)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
       builder (~> 3.0.0)
-    activerecord (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
+    activerecord (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.17)
-      activemodel (= 3.2.17)
-      activesupport (= 3.2.17)
-    activesupport (3.2.17)
+    activeresource (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+    activesupport (3.2.18)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.3)
@@ -200,7 +200,7 @@ GEM
       polyamorous (~> 0.5.0)
     method_source (0.8.1)
     mime-types (1.25.1)
-    multi_json (1.9.2)
+    multi_json (1.10.0)
     multi_xml (0.5.3)
     multipart-post (1.2.0)
     mysql2 (0.3.11)
@@ -237,22 +237,22 @@ GEM
       rack (>= 1.0)
     rack-throttle (0.3.0)
       rack (>= 1.0.0)
-    rails (3.2.17)
-      actionmailer (= 3.2.17)
-      actionpack (= 3.2.17)
-      activerecord (= 3.2.17)
-      activeresource (= 3.2.17)
-      activesupport (= 3.2.17)
+    rails (3.2.18)
+      actionmailer (= 3.2.18)
+      actionpack (= 3.2.18)
+      activerecord (= 3.2.18)
+      activeresource (= 3.2.18)
+      activesupport (= 3.2.18)
       bundler (~> 1.0)
-      railties (= 3.2.17)
-    railties (3.2.17)
-      actionpack (= 3.2.17)
-      activesupport (= 3.2.17)
+      railties (= 3.2.18)
+    railties (3.2.18)
+      actionpack (= 3.2.18)
+      activesupport (= 3.2.18)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.2.2)
+    rake (10.3.1)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.3.0)
@@ -402,7 +402,7 @@ DEPENDENCIES
   rabl
   rack-livereload
   rack-throttle
-  rails (= 3.2.17)
+  rails (= 3.2.18)
   rake
   redcarpet (= 2.3.0)
   rspec-rails (~> 2.4)

app/assets/stylesheets/partials/_grid.scss

@@ -80,6 +80,10 @@
     text-align: center;
   }
   .container {
+    .formtastic#new_comment .actions li {
+      width: 100%;
+      text-align: center;
+    }
     // Home page search form should be tweaked
     // Also alert sign up form
     form.alert, .address-search {
@@ -166,7 +170,7 @@
   // footer
   .keepintouch {
     @include span-columns(6, 12);
-  }  
+  }
   .oaf {
     @include span-columns(6 omega, 12);
   }
@@ -232,7 +236,7 @@
   #header {
     h1 {
       font-size: 2.5em;
-    } 
+    }
     h2 {
       font-size: 1em;
     }
@@ -297,7 +301,7 @@
   }
   #main {
     width: 70%;
-    margin-right: 2%; 
+    margin-right: 2%;
   }
 
   #content {
@@ -408,7 +412,7 @@
       @include span-columns(12,24);
     }
     .oaf {
-      @include span-columns(12 omega, 24);    
+      @include span-columns(12 omega, 24);
       text-align: right;
     }
   }