Model may override createId function
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/db.js
Version bump to 0.3.2