Account for new Grunt + simple file names.
Preparing a pull...
Merge branch 'master' of github.com:wiredearp/spiritual-web

Conflicts:
	site/test/edb/tags/regular/index.html
Capitalize @TODO + rename models to types.
Get it in there.
Deprecate Object.model construct.
$contentmode becomes $contenttype (soon to become $of).