Switch to using a key/value dictionary for source
Merge branch 'master' of github.com:anchor/vault