Merge pull request #327 from andymcc/vlan_fix

Revert "Adjust nova to account for VLAN change to nova-networks cookbook...
Fix for adjustment to network definitions