Merge "Adds support for storing and getting vim creds"