Move slugs to be type-dependent.
Merge branch 'master' of github.com:pharpend/lambdatube

Conflicts:
	config/models