Merge branch 'devel'
wip
Prepare for Blaze changes in 0.9.1

(The relevant version of Blaze is on the
blaze-templates branch at the moment)
kind -> name
Merge pull request #4 from avital/master

Prepare for Blaze changes in 0.9.1
Merge branch 'master' into devel

Conflicts:
	versions.json