Fix merge conflict, inter-example spec dependencies
Merge pull request #169 from opscode/adamed-knife-381

KNIFE-381: Add ability to associate public ip with VPC instance on creation
remove escaped single quote to fix cosmetic display of summary

Fixes the summary from looking like this-
EC2 Support for Chef\'s Knife Command

To looking like this-
EC2 Support for Chef's Knife Command
Merge pull request #170 from opscode/adamed-gemspec

Remove escaped single quote to fix cosmetic display of summary