Merge pull request #133 from vuntz/nova-config

Correctly setup the nova-related options
Set the availability zone if it was configured