accept non-default resource URI on the collect client
Merge branch 'enum_info' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows into enum_info
cleaning up the lib directory prior to Rob moving txwinrm to there
fix the collector plugins for change to API where resource_uri can be specified.
fix path to TypeperfSc1Plugin. remove username password from objects.xml
Merge branch 'master' of github.com:zenoss/ZenPacks.zenoss.Microsoft.Windows

Conflicts:
	ZenPacks/zenoss/Microsoft/Windows/modeler/plugins/zenoss/winrm/WinServices.py
	ZenPacks/zenoss/Microsoft/Windows/txwinrm/collect.py
	ZenPacks/zenoss/Microsoft/Windows/txwinrm/enumerate.py
fix modeling
Merge pull request #6 from zenoss/bedwards

fix modeling
install/remove symlinks to command line utilities
add command line utils to bin directory
add lib to path in scripts. add an __init__.py. Don't create/delete bin dir in makefile.
don't create/delete lib dir in makefile
delete lib/txwinrm on clean
Merge pull request #8 from zenoss/symlinks

Put txwinrm command line utils on the PATH
Updated format