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

Add support for unmarshalling ECC passvault
Fix bad formatting.
Merge pull request #28 from grittygrease/master

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