ec2: fix security groups
ec2: get more tests passing

/cc @mwhooker - I'm unsure why this last test is failing...
Merge remote-tracking branch 'origin'

Conflicts:
	s3/multi_test.go