Merge pull request #40 from rossbruniges/dev

Fixing a few bugs
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