add vpn_image_id as a template variable with no default
typo
Merge pull request #230 from rackerjoe/master

Merged automatically by jenkins after successful build test