Added Storage#readWallet and used this from WalletFactory
Added methods for storing/reading from sinlge key-value pair
Removed unused functions and refactored tests
Wallets in both formats only get listed once
Merge pull request #1468 from isocolsky/ref/storage

Refactor wallet storage