ec2 - added support for associating public ip with vpc instance on launch
removed duplicate NetworkInterface.n.AssociatePublicIpAddress option
cleaned up logic for multiple security groups for vpc instances with manually specified network interfaces
Merge commit 'a40a37110c7b843ca4a819c50f89a916d11c3442'
Merge branch 'master' of https://github.com/fog/fog

# By Nick Osborn
# Via Nick Osborn
* 'master' of https://github.com/fog/fog:
  [vcloud_director] Fix minor documentation typo
  [vcloud_director] Better mocking and documentation.
added instance request and server model tests for associate_public_ip
vpc associate_public_ip test
[google|compute] Update bootstrap image to debian-7-wheezy-v20130816.
Merge pull request #2190 from icco/master

[google|compute] Update bootstrap image to debian-7-wheezy-v20130816.
Merge pull request #2152 from TheWeatherChannel/master

Add ability to associate public ip with VPC instance on creation
[vcloud_director] Set :idempotent on GET requests
Auto-merge remote-tracking branch 'upstream/master'