Merge pull request openoakland#2 from RobertStewart/master

 Updated title and tagline in sidebar.

.gitignore

@@ -16,3 +16,7 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+
+# OS X detritus
+.DS_Store
+

app/views/main/index.html.haml

@@ -5,7 +5,8 @@
         / = image_tag "logos/adoptasiren.png", :alt => t("titles.main", :thing => t("defaults.thing").titleize), :title => t("titles.main", :thing => t("defaults.thing").titleize)
       %h2
         %br
-        [ADOPT-A-DRAIN]
+        Oakland Adopt a Spot
+        MAINTAIN A DRAIN
       %h1
         \///////////
 
@@ -23,11 +24,7 @@
             = image_tag "logos/cfa.png", :alt => t("sponsors.cfa"), :title => t("sponsors.cfa")
         #col2
           %a{:href => "http://www2.oaklandnet.com/"}
-            = image_tag "logos/oakland-seal.jpeg", :width => '90px', :alt => t("sponsors.city"), :title => t("sponsors.city")
-          %p#mayor
-            %a{:href => "http://www2.oaklandnet.com/"}
-              = t("sponsors.mayor.name") +", "+ t("sponsors.mayor.title") 
-
+            = image_tag "logos/oakland_nyt.jpg", :width => '90px', :alt => t("sponsors.city"), :title => t("sponsors.city")
 
       #feedback
         %p

config/locales/en.yml

@@ -31,7 +31,7 @@ en:
     state: "CA"
     thing: "storm drain"
     this_thing: "This %{thing}"
-    tagline: "Claim responsibility for clearing a storm drain entrance and reporting any problems."
+    tagline: "Volunteer to keep a storm drain clear and report any problems!"
     tos: "By signing up, you agree to the %{tos}."
     voice_number: "510-555-1212"
     zip: "94612"