Merge branch 'master' of https://github.com/mde/geddy into mde-master

Conflicts:
	lib/init/model.js
	package.json