Fix bug 1071230: Update "let us know" link
Bug 1024507: Measure use of Twitter and Facebook

Luke organized the logic so that Google Analytics event calls would work
correctly [1]. His commit was squashed into the prior commit to maintain
a history of working commits.

[1] https://github.com/groovecoder/kuma/commit/4bbd5f89e3539faeecdcbdb850c45508e265b709
fix bug 1063830 - detect unmatched login in pre_social_login

redirect mis-matched social logins

send user back to signup with error message
bug 1063830 - fix and add pre_social_login tests
fix bug 1070942 - add a contribute.json file
Fix bug 1071780: Don't notify after partial signup
Merge pull request #2734 from openjck/1024507-twitter-facebook-research

Bug 1024507: Measure use of Twitter and Facebook
Merge pull request #2761 from openjck/1071230-let-us-know-link

Fix bug 1071230: Update "let us know" link
fix bug 1072273 - use better language in some of the allauth messages.
Merge pull request #2759 from jezdez/bug1070942-contribute.json

fix bug 1070942 - add a contribute.json file
Merge pull request #2769 from openjck/1071780-registration-notice-on-abandonment

Fix bug 1071780: Don't notify after partial signup
Merge pull request #2751 from groovecoder/connect-with-unmatched-persona-1063830

fix bug 1063830 - detect unmatched login in pre_social_login
Merge pull request #2771 from jezdez/bug1072273

fix bug 1072273 - use better language in some of the allauth messages.
Bug 1043604: Add global Apache configuration

A new file is added, all-servers.conf, which contains Apache settings
that should be used on all servers. The file is hooked up to our local
environment via Puppet and the WebOps team will ensure that it's also
used on our public servers.
Bug 1059828: Begin adding tests for allauth workflows.

This consolidates and/or obsoletes some of our pre-existing tests with
new, more granular tests of the Persona workflow.

Tests added/consolidated here verify that:

* Persona authentication failure is handled gracefully.

* Persona authentication failure produces the correct error message.

* Persona authentication during signup properly leads into profile
  creation.

* Persona-based profile creation shows the correct Persona-relevant
  messages.

* Persona sign-in with an existing account redirects correctly (to
  home page or to page the user signed in from).

* After signing in with Persona, auth-related UI elements show Persona
  identification.

* Pages displayed to non-authenticated users come pre-loaded with the
  stub Persona form and relevant data attributes.

* After signing up with Persona, a new Django User object and a new
  SocialAccount object are created, and populated with the correct data.

* After signing up with Persona, auth-related UI elements show Persona
  identification.
Merge pull request #2774 from openjck/1043604-root-apache-config

Bug 1043604: Add global Apache configuration
Merge pull request #2750 from ubernostrum/auth-tests-1059828

Bug 1059828: Begin adding tests for allauth workflows.
fix bug 1056950 - only send welcome email when at least one email address is verified

This also delays sending the welcome email till after the initial email address confirmation has happened.
Merge pull request #2773 from jezdez/bug1056950

fix bug 1056950 - only send welcome email when at least one email address is verified
fix bug 1072921 - make sure some of the allauth tests are better isolated with regard to user object creation