Merge branch 'ec2_nested_groups' of https://github.com/cchurch/ansible into cchurch-ec2_nested_groups

Conflicts:
	plugins/inventory/ec2.py