MVP for badge categories
Minor fixes
Removing redundant `async`
Fixing category filter
Making sure categories are copied
Updating package.json for latest streamsql
Tidying front-end for badge categories
Merge branch 'master' into badge-categories

Conflicts:
	app/static/scss/badge.scss
	app/templates/badge/edit.html
Fixing munged merge
UX tweaks
Passing badge type and categories to BadgeKit
Small fixes
Preventing orphans
Ensuring badge category integrity
Merge pull request #335 from mozilla/badge-categories

[WIP] Badge categories (resolves #330)