Seeding tests.
Seed file updates.
Seed files updated, organization formatted.
Log updates.
Merge branch 'seeding2'

Conflicts:
	log/development.log
	tmp/pids/server.pid