Merge pull request #5 from Magenic/master

Merging in changes from mainline.
Merge pull request #6 from Magenic/master

Merging into my local fork.
Getting the badges to look right for corporate badges.
More changes to HTML

Added functionality for Activities a little bit and added html sections
to layout content.
Merge pull request #7 from Magenic/master

Updating my local fork
Merge pull request #20 from jwendl/master

Merging in changes to get the badge display to look good