Squashed commit of the following:

commit ac047201a00708f117cf19d4711f81aab7a63cf1
Merge: 6f42c1a ca7448d
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 26 10:38:46 2012 -0700

    Merge branch 'bug-797379-state-of-mozilla-2011' of github.com:craigcook/bedrock into bug-797379-state-of-mozilla-2011

commit 6f42c1a313eafd68a6451351233e54a71afb19fe
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 26 10:24:26 2012 -0700

    Progress

commit bb46674515d85bb7660edcf80d807e26bfc59019
Author: Craig Cook <craigcook@gmail.com>
Date:   Thu Oct 25 18:01:19 2012 -0700

    Further progress

commit e07ac24e3eba0e53879b4556a177e902ce13d44b
Author: Craig Cook <craigcook@gmail.com>
Date:   Wed Oct 24 15:41:55 2012 -0700

    Progress. A few more sections, script tweaks, some new strings for l10n that I missed.

commit a4a919e5dcc3b6cb8a78b10f0013d0d171ebdb23
Author: Craig Cook <craigcook@gmail.com>
Date:   Tue Oct 23 12:12:09 2012 -0700

    i18n improvements

commit 0b852004fe1dbdbae4b79e209fd2e254ea6470fc
Author: Craig Cook <craigcook@gmail.com>
Date:   Wed Oct 17 16:42:56 2012 -0700

    Added FAQ page, giving l10n a head start

commit b028fb8fbabc57c96513820f6e25aac47df4215e
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 12 00:58:32 2012 -0700

    First commit, saving progress

commit ca7448d5b98cb519cc860f43b818e4c7e5242603
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 26 10:24:26 2012 -0700

    Progress

commit e4c22ca09ef4d423c497a1ad9b6fc51e5d915789
Author: Craig Cook <craigcook@gmail.com>
Date:   Thu Oct 25 18:01:19 2012 -0700

    Further progress

commit 55fcd4fe003d86bdfdbf5b514b8fa1db8dfff913
Author: Craig Cook <craigcook@gmail.com>
Date:   Wed Oct 24 15:41:55 2012 -0700

    Progress. A few more sections, script tweaks, some new strings for l10n that I missed.

commit 7216575517186d6efe8abad999691e15b174f183
Author: Craig Cook <craigcook@gmail.com>
Date:   Tue Oct 23 12:12:09 2012 -0700

    i18n improvements

commit 8bef1fb0e8476c8fb49be0e9493414dcde0789ea
Merge: f7bb597 ffd96df
Author: Craig Cook <craigcook@gmail.com>
Date:   Tue Oct 23 08:52:43 2012 -0700

    Merge branch 'bug-797379-state-of-mozilla-2011' of github.com:craigcook/bedrock into bug-797379-state-of-mozilla-2011

    Conflicts:
    	apps/foundation/templates/foundation/_country_select.html

commit f7bb597e2f0eb1a30e0cd0cc95e321b128e4ce4a
Author: Craig Cook <craigcook@gmail.com>
Date:   Wed Oct 17 16:42:56 2012 -0700

    Added FAQ page, giving l10n a head start

commit 0d330351766000b462813695828a5b7fe3fc3b62
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 12 00:58:32 2012 -0700

    First commit, saving progress

commit ffd96df89f166f45e785813471662db3c77482ab
Author: Craig Cook <craigcook@gmail.com>
Date:   Wed Oct 17 16:42:56 2012 -0700

    Added FAQ page, giving l10n a head start

commit c43acc0202746b8b5507dbc6710d0e29512ad880
Author: Craig Cook <craigcook@gmail.com>
Date:   Fri Oct 12 00:58:32 2012 -0700

    First commit, saving progress
Better HTML page titles for style guide pages (Bug 805875)
(use a template var to share title between HTML page title and in-page heading)
Also, a tiny style fix for the Domain strategory page
Bug 806939 - FAQ link not working because it lacks a function call
Latest updates

* More content blocks
* Removed wordmark
* Nixed text modals
* Links open new windows
* Fixed up non-JS styling
* Better keyboard access
* Fixed FAQ link
* Misc tidying
Merge branch 'bug-797379-state-of-mozilla' of github.com:mozilla/bedrock into bug-797379-state-of-mozilla

Conflicts:
	apps/foundation/templates/foundation/annualreport/2011.html
Bug 801725 Update news headlines on home page
Fixed some typos (see bug 788871)
Bug 804810 redirect Visual ID pages to Style Guide
Compare independently of the order

Also improves the error message received
fix bug 807383
Merge branch 'master' into bug-797379-state-of-mozilla
Fix bug 806936 - adding partner logos to the moz.org page
Updates to State of Mozilla

Navigation
Contributor stories (some new strings here, sorry Pascal)
Sustainability section
Merge branch 'bug-797379-state-of-mozilla' of github.com:mozilla/bedrock into bug-797379-state-of-mozilla
Bug 807301 - state of mozilla: reuse localized strings in FAQ page from main page
Fixed JS error for FAQ page

Script was trying to change attributes of an element that doesn't exist on the page. Fixed by wrapping it in an if.
Merge branch 'bug-797379-state-of-mozilla' of github.com:mozilla/bedrock into bug-797379-state-of-mozilla
Bug 805679 Add wordmark to Firefox OS page in style guide
Typo in persona/developer-faq.html, misplaced ')'
Merge pull request #449 from tobarja/patch-1

Typo in persona/developer-faq.html, misplaced ')'
Correctly install gettext into Jinja2. Fix bug 808580.