Better seed data for opportunities
Merge branch 'master' into better-seeds

Conflicts:
	db/seeds.rb