Merge pull request #228 from rackerjoe/master

api_ec2_process_name was missing
added option for cinder_catalog_info
added option for cinder_catalog_info
Merge pull request #229 from rpawlik/master

Merged automatically by jenkins after successful build test
add vpn_image_id as a template variable with no default