some idiot (@nquinlan) left in some merge conflicts
moved google analytics to the bottom

best practice is to have javascripts at the bottom (even though Google
tells you otherwise)