Merge branch 'ec2-params' of https://github.com/scottanderson42/ansible into scottanderson42-ec2-params

Conflicts:
	lib/ansible/module_utils/ec2.py
	library/cloud/ec2