Cleaned up base.html
Finished the Badges for Team Members

Created badges table as well as badge attribute for team members. May
add images to the badges later. Also added badge fixtures to json
object.
Deleted Swap and got rid of comments :)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	internal/initial_data.json
	internal/templates/base.html
	internal/templates/profiles/profile.html
Fixed display of the badges.
Merge pull request #31 from ngovkevin/master

Made the changes that were asked from the previous pull requeset