Merge pull request #40 from rossbruniges/dev

Fixing a few bugs
Merge pull request #42 from rossbruniges/master

Mix-master merge from erikao, sinker and rossbruniges
Fix #43 - new google analytics snippet
Merge pull request #44 from rossbruniges/google-analytics

Fix #43 - new google analytics snippet
updated some of the text on the site to reflect that it is now 2013
Merge pull request #46 from rossbruniges/dev

Merging code to dev
Merge pull request #47 from mozilla/dev

Merging dev up to live
starting to fold the learning stuff in
adding more to the learning page
OK, learning page and nav updated
updated the Source page to reflect learning
Putting in references to the new learning section on source
Merge pull request #49 from rossbruniges/dev

Putting in references to the new learning section on source
Merge pull request #50 from mozilla/dev

Merging up from develoment to master
upstream merge and code sprint additions
finalized the code sprints page
Merge branch 'master' of git://github.com/sinker/mozilla-opennews into dev
Merging in changes from @sinker and fixing up a missing paragraph tag
Merge pull request #52 from rossbruniges/dev

Pulling in additions to code sprint pages from @sinker
Merge pull request #53 from mozilla/dev

Closes #51 - merging up codesprints page from dev to master