Add support for Vault
Merge branch 'vault' into ktosiek

Conflicts:
	ansible-shell