Merge pull request #1202 from nitzmahone/ec2_state_validation

Added choice validation for EC2 state arg

cloud/amazon/ec2.py

@@ -1199,7 +1199,7 @@ def main():
             instance_profile_name = dict(),
             instance_ids = dict(type='list', aliases=['instance_id']),
             source_dest_check = dict(type='bool', default=True),
-            state = dict(default='present'),
+            state = dict(default='present', choices=['present', 'absent', 'running', 'stopped']),
             exact_count = dict(type='int', default=None),
             count_tag = dict(),
             volumes = dict(type='list'),