Complete Vault implementation
Fix merge conflicts
Start building for 1.7
Add Messenger class