Merge pull request #14 from jwendl/master

Badge functionality
Merge pull request #2 from Magenic/master

Pull in Justin's changes
Made changes to add badge list and activity list.
Change config file.
Merge pull request #15 from Bowman74/master

Added badge and activity collections
Merge pull request #5 from Magenic/master

Merging in changes from mainline.