Merge pull request #2 from ramsey/master

Setting up the site with a new teaser page and archiving the 2011 pages.
Merge pull request #6 from ramsey/master

Syncing up the master branch
Merge remote-tracking branch 'scoates/master'