better hosts managment

Conflicts:
	mc_states/modules/mc_localsettings.py