Adjust & pngout d-logo-sketch.png

d-logo-sketch.png and d-logo-sketch-small.png were previously out of
alignment, causing the stylized D to shift left when the two logos
changed. This has been fixed in paint.net, and the edited png has been
compressed with pngout.
Sort the badges on the user profile page

Also clean up UserBadgesController so it isn't doing two things in one
method
Fix badge type ordering
proper fix for top page bottom buttons on mobile
Merge pull request #2692 from riking/sorted_badges

Sort the badges on the user profile page
Merge pull request #2691 from fysics/master

Adjust & pngout d-logo-sketch.png
Fix tests for new route
Merge pull request #2693 from riking/sorted_badges

Fix the tests