Fix for the subnet/vlan confusion, this only cropped up in EC2-Classic testing
Merge pull request #50 from maksimov/2014.03

Fix for the subnet/vlan confusion