Added check for nil
Merge branch 'master' of https://github.com/aidanmorgan/vagrant

Conflicts:
	plugins/communicators/winrm/communicator.rb