Merge kyledrake changes

app.rb

@@ -1546,8 +1546,9 @@ end
 
 def require_login
   redirect '/' unless signed_in?
-  if current_site.is_banned || parent_site.is_banned
+  if session[:banned] || current_site.is_banned || parent_site.is_banned
     session[:id] = nil
+    session[:banned] = true
     redirect '/'
   end
 end
@@ -1567,9 +1568,10 @@ def parent_site
 end
 
 def require_unbanned_ip
-  if Site.banned_ip?(request.ip)
+  if session[:banned] || Site.banned_ip?(request.ip)
     session[:id] = nil
-    flash[:error] = 'Your IP address has been banned due to misconduct/spam. '+
+    session[:banned] = true
+    flash[:error] = 'Site creation has been banned due to ToS violation/spam. '+
     'If you believe this to be in error, <a href="/contact">contact the site admin</a>.'
     return {result: 'error'}.to_json
   end

views/plan/_pricing.erb

@@ -82,7 +82,7 @@
 
       <div class="col col-25 catbus">
 
-        <div class="plan-image" data-original-title="VROOOOOOM!"></div>
+        <div class="plan-image" data-original-title="いきましょう"></div>
         <h3>Cat Bus</h3>
         <div class="price">$<%= Site::PLAN_FEATURES[:catbus][:price] %></div>
         <div class="interval">per month</div>