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
Upgrade keyring installation
Fix merge conflicts

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

Upgrade keyring installation
Rename old salt-bootstrap prep state
Add new salt-bootstrap prep state
Remove unnecessary dependencies to test salt-bootstrap
Don't require patch!
Install the multilib version of gcc on Arch
Typing too fast!
Remove gcc-multilib before installing gcc in Arch
We don't need the test account. We should use root.
Remove the sudoers file
Add minimum boto version to install

This should fix the ubunutu 12 failures on 2014.7
Merge pull request #59 from rallytime/boto_version

Add minimum boto version to install