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