Minor changes
Merge branch 'master' of github.com:Unidata/vcmtp

Conflicts:
	VCMTPv3/shawn/recv/vcmtpRecvv3.cpp