Merges switches_worker to master, This is a special case

@gunhilldillz , Thought I might incorporate some changes from long ago before we migrate to web-sockets