Full path to ec2.py

changed ansible version to 1.1 in requirements.txt
updated the ec2 tag in test.yaml
fix merge collision that got commited by mistake
Merge branch 'master' of github.com:edx/configuration into sefk-hacking

Conflicts:
	playbooks/test.yaml
both sef and jarv keys (for testing)
Update README.md
Update README.md
unique naming
Merge branch 'master' of github.com:edx/configuration into sefk-hacking