Merge pull request #1 from grittygrease/server-reload-fix

Add support for unmarshalling ECC passvault