Move hooks around a bit for better compat and layout

git-svn-id: https://plugins.svn.wordpress.org/always-show-admin-bar/trunk@903649 b8457f37-d9ea-0310-8a92-e5e31aec5664