Add support for ip version ss131122
Refactor the network tests to rspec 3, merge in test for new vlan output
Merge branch 'trusty_network' of github.com:cread/ohai into cread-trusty_network

Conflicts:
	spec/unit/plugins/linux/network_spec.rb
Merge branch 'cread-trusty_network'