Full path to ec2.py

changed ansible version to 1.1 in requirements.txt
updated the ec2 tag in test.yaml

README.md

@@ -48,7 +48,7 @@ Create a user
 
   ```
   cd playbooks
-  ansible-playbook test.yaml -i ec2.py --private-key=/path/to/deployment.pem
+  ansible-playbook test.yaml -i /path/to/ec2.py --private-key=/path/to/deployment.pem
   ```
 ### CloudFormation TODO for mongo backed LMS stack
 

ansible-requirements.txt

 Jinja2==2.6
 PyYAML==3.10
+<<<<<<< Updated upstream
 ansible
+=======
+ansible==1.1
+>>>>>>> Stashed changes
 argparse==1.2.1
 boto==2.8.0
 paramiko==1.10.1

playbooks/test.yaml

-- hosts: tag_Name_edx-tst1
+- hosts: tag_Name_edx-ec2
   sudo: yes
   user: ubuntu
   tasks: