Fixing view errors
Merge pull request #7 from mozilla/views

Fixing view errors
Merge branch 'master' into teams
We'll get there eventually
Merge pull request #8 from mozilla/views

We'll get there eventually
Merge branch 'master' into teams
Minor import tweaks
Merge pull request #9 from mozilla/views

Minor import tweaks
Merge branch 'master' into teams
Extending people URLs for badges/awards
Merge pull request #10 from mozilla/people

Extending people URLs for badges/awards
Fixing up JSON view
Merge pull request #14 from mozilla/views

Fixing up JSON view
Stupid fixes
Setting up some templates
Don't need `placeholder_view` any more
Merge pull request #16 from mozilla/templates

Setting up some templates
Merge branch 'master' into teams

Conflicts:
	mozbadges/site/base/templates/base.html