Tweaks, and use annotations instead of map
Renamed misspelled "bagdes" to "badges" everywhere (doc and code)

This bit us during our code lab today. Alexandre fixed one instance.
This fixes all of the rest.
Merge pull request #37 from chalin/patch-3-rename-bagdes-to-badges-everywhere

Renamed misspelled "bagdes" to "badges" everywhere (doc and code)
Merge pull request #32 from sethladd/patch-5