Use our PyPi mirror and default to Python's if ours is down
Merge pull request #57 from s0undt3ch/master

Use our PyPi mirror and default to Python's if ours is down
Fix merge conflicts

Conflicts:
	python/keyring.sls