changed to ephemeral yard raet
Merge branch 'sam_raet_50' into ephemeral

Conflicts:
	salt/daemons/flo/core.py
updated
Consistent worker yard names