Add keyword to description, re-structure the events.
Merge pull request #59 from moztw/master

re-structure events for contribute-2