Merge remote-tracking branch 'nico/bp/windows-support' into testing07162014

Conflicts:
	requirements.txt
	satori/bash.py
	satori/contrib/psexec.py
	satori/smb.py
	satori/ssh.py
	satori/sysinfo/ohai_solo.py
	satori/tunnel.py

Change-Id: I1e2dcb43930ff3ee7aec977333682e7f7fd34809