Small changes to get to build
Merge branch 'master' of github.com:Unidata/vcmtp