Completely finish cleaning up the replication functionality in the tray watcher it works great now.
Merge branch 'master' of github.com:pcbsd/pcbsd