Set tenant_network_type and network_vlan_ranges in neutron conf file
Use num_vlans attribute from neutron proposal instead of hard-coded 2000
Merge pull request #6 from vuntz/neutron-fixes

Set tenant_network_type and network_vlan_ranges in neutron conf file