Revert "Adjust network attributes to match new nova-network scheme"

This reverts commit 480621f2d1d1c2ac92625360e6284bc707e355b3.
Merge pull request #104 from andymcc/vlan_fix

Revert "Adjust network attributes to match new nova-network scheme"