Get rspec tests working
Merge branch 'fixrspec' into newsavon

Conflicts:
	winrm.gemspec
Update nori code for nori 2.x  This involves removing the
lib/winrm/winrm_service.rb code