Revert "Revert "Merge pull request #33 from square/reloading-keystore""

This reverts commit 425347d5ff67fd2dc684bd1625b227ab7f6aa203.

The downstream dependency should be resolved.