Fixes and groundwork for instance control

Fixed a bunch of nits, including help mistakes
Laid the groundwork for instance control
Changed the --group option to --sec-group since the group
option will be better used for instance control
Merge remote-tracking branch 'upstream/master'
Fix the --hvm help string.

Previously, it was a duplicate of the --list-ami help string.