Update CLi options to Fog key mappings

Recent updates to the options names in 
24f86efeb5f9781d0c7c3d531698e765bd13697b failed to make the corresponding
changes when mapping option names passed to Fog.  This broke setting the
security group(s) and tags on created instances.