Merge pull request #56 from mancdaz/grizzly

Merged automatically by jenkins after successful build test
Adjust network definitions so network settings can be adjusted
Merge pull request #58 from andymcc/network_change

Merged automatically by jenkins after successful build test
Allow VLANs to be specified for nova-network
Merge pull request #59 from andymcc/nn_vlan

Merged automatically by jenkins after successful build test