Merge branch 'ec2_security_token' of https://github.com/willthames/ansible into willthames-ec2_security_token
