Fix for issue 3064
3400 add link back to collection for prompt blurbs
When sorting by taggings count, also provide secondary sorting by name

Taggings count don't provide enough order - when too many tags have the same number of uses, the results of sorting are unpredictable and the order keeps changing.

This adds secondary sorting by name, ascending, when the taggings count is the same.
Issue 3285:  Include the site name in the sender field of notification emails
Fixing mailer issues
More rebase nonsense
Added tests
Created specs for the mailers
Adding merged changes
Adding merged changes
Fixed after_tasks.rake and correct app/views/admin/_header.html.erb
Updated skin_steps.rb to use FactoryGirl
Added link to Hi, username! menu
Modified greeting.html.erb based on sarken's feedback
Added change to application_controller based on sarken's testing
Fixed application_controller change when logging out after viewing a skin
3769 In user navigation, make it My Preferences and remove subscriptions count
3821 Delete draft from drafts index with JavaScript disabled
3821 Let application.js handle the data-method attribute
3821 Keep the draf deletion test passing