Minion restart if master is not responding
Merge branch 'fix_ddns2' of git://github.com/steverweber/salt into steverweber-fix_ddns2

Conflicts:
	salt/config.py
Merge branch 'steverweber-fix_ddns2' into develop