Updating with some of the new options

- web.activityDurationChoices now set to "1 3 7 14" rather than
  default of "7 14 28 60 90 180"
- web.metricAuthorExclusions has l10n-bot & jenkins-bot added to
  it doesn't skew statistics
- web.activityCacheDays is set to 3 days, should improve performance
- Everything else is default from upstream, mostly comment changes

Change-Id: I1f705d13d806ed8b3b057a905cd2499992129dfa
Merge "Updating with some of the new options" into production