mozilla/mozilla-ignite — pull request #94 by rossbruniges (2012-09-24 11:11:23+00:00)
Title: Fixing merge conflicts from dev to staging

Pull request includes copy changes sent from @benrito