adding method to get master's fingerprint
Merge branch 'develop' of github.com:craig5/salt into develop

Conflicts:
	salt/modules/key.py