update to use 'new' vcode and keyid
Merge pull request #8 from neiled/master

Update requirements