Update prior to pull merge of minor changes to winproc.
Merge branch 'master' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/lib/txwinrm/__init__.py
	ZenPacks/zenoss/Microsoft/Windows/lib/txwinrm/collect.py
Merge branch 'datasources' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into datasources
add datasource, IInfo, and Info classes. Add config_key method. Add bindings in configure.zcml