database.yml generator
Merge remote-tracking branch 'origin/master'

Conflicts:
	daddy.gemspec