ENH: Updated to work on windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	miniature-hipster/pyspec_into_broker.py