refactor seed module -- detect path type: block, dir, or image
Merge remote-tracking branch 'origin/develop' into seed-refactor

Conflicts:
	salt/modules/seed.py
Merge pull request #7062 from mgwilliams/seed-refactor

refactor seed module -- detect path type: block, dir, or image