renamed module from diff.py to survey.py, added diff function, numerous refactoring
Merge branch 'develop' of https://github.com/edlane/salt into develop

Conflicts:
	salt/runners/diff.py
pulled from github
Merge pull request #10960 from edlane/develop

Final rename of salt runner "diff.py" to "survey.py" and new functionality