Fixed a few typos in firewall tests. VPC was being passed instead of the subnet. Also made VPC conditional slightly broaded to include OPTIONAL.
Merge branch 'develop' of https://github.com/maksimov/dasein-cloud-test into develop
Broadened the criteria for vlan to be != NONE
Merge pull request #36 from maksimov/develop

Altered the test criteria slightly to include OPTIONAL for the choice of VLAN. Code reformatted, etc.