Support selecting various sizes of profile pics

app/views/layouts/_navigation.html.haml

@@ -29,7 +29,7 @@
             %li.dropdown
               %a.dropdown-toggle{"data-toggle" => "dropdown", href: '#', id: "current-user-detail"}
                 = current_user.name
-                = image_tag(current_user.profile_picture(size: '18'), title: "Yo #{current_user.name}!", alt: '')
+                = image_tag(current_user.profile_picture(size: '18'), class: 'profile-thumbnail', alt: '')
                 %b.caret
               %ul.dropdown-menu
                 = render 'layouts/user_menu'

app/views/users/edit.html.haml

@@ -12,13 +12,14 @@
           = "Avatar"
         = image_tag(@user.profile_picture(size: '48'), title: "Yo #{@user.name}!", alt: '')
         = link_to 'Change your avatar here', 'https://gravatar.com'
-      %br
         %p
           Or upload a picture.
-        = image_tag f.object.picture.thumb.url if f.object.picture?
-        - if @user.picture?
-          = image_tag(@user.picture.thumb.url, width: '20%')
         = f.input :picture, hint: 'If you upload a picture, it will be used in place of Gravatar.'
+        - if @user.picture?
+          %p
+            Current Picture
+            %br
+            = image_tag(@user.picture.thumb.url, width: '20%')
 
         = f.input :affiliation, as: :string,
           hint: 'This could be a company, a user group, or nothing at all.'