Upgrade keyring installation
Fix merge conflicts

Conflicts:
	python/keyring.sls
Merge pull request #58 from rallytime/upgrade_keyring

Upgrade keyring installation