Merge pull request #27 from koalaaaa/master

Fix saving of vaults
Reformat
Revert "Reformat"

This reverts commit 4628cc813045204849bfa9743ec545f3b7b37e14.