Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
Merge remote-tracking branch 'upstream/2014.7' into 2014.7_sam4
Changed src to None so not use 'id' for source estate
Still problem with dst estate hard coded to 'master'
Added comments about RAETChannel use cases
Backport processmanager

Conflicts:

	salt/master.py
Basics working, can't handle restart of a master yet...
Handle failures of upstream masters
Update notes
pep8
Major re-work to look more like MultiMinion
Add hard coded timeout for syndic being dead
More code cleanup, wrap all the calls to syndics in _call_syndic
Make backoff use acceptance_wait_time
Pep8 cleanup
Add master_id to master docs
Add master_id to pub/ret data as ground work for multi_syndic

Conflicts:

	salt/minion.py

Conflicts:

	salt/minion.py
Clean up shutdown process, since these are only in one of the child processes
Handle OSError, you will get this because the signal handler interrupts the systemcall to avoid traces like:

```
Traceback (most recent call last):
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 232, in _bootstrap
    self.run()
  File "/usr/lib64/python2.6/multiprocessing/process.py", line 88, in run
    self._target(*self._args, **self._kwargs)
  File "/home/thjackso/src/salt/salt/master.py", line 308, in run_reqserver
    reqserv.run()
  File "/home/thjackso/src/salt/salt/master.py", line 506, in run
    self.__bind()
  File "/home/thjackso/src/salt/salt/master.py", line 500, in __bind
    self.process_manager.run()
  File "/home/thjackso/src/salt/salt/utils/process.py", line 180, in run
    pid, exit_status = os.wait()
OSError: [Errno 4] Interrupted system call
```
Break on error, to avoid races and stuff
An additional race condition in shutdown-- if the signal is sent to all children