Merge pull request #265 from Skud/profile-email

fixed(?) firefox bug with email address in location field

app/views/devise/registrations/edit.html.haml

@@ -11,6 +11,11 @@
       = f.email_field :email
       %span.help-inline If you change your email address you will have to reconfirm.
 
+  .control-group
+    .controls
+      = f.check_box :show_email
+      Show email publicly on your profile page
+
   .control-group
     .controls
       = f.check_box :send_notification_email
@@ -32,12 +37,8 @@
     =f.label :location, 'Your location', :class => 'control-label'
     .controls
       =f.text_field :location
-      %span.help-inline Be as detailed or vague as you like.
+      %span.help-inline This will be displayed on a map. You can be as detailed or vague as you like.
 
-  .control-group
-    .controls
-      = f.check_box :show_email
-      Show email publicly on your profile page
 
   %h2 Linked accounts