Add support for ip version ss131122
Refactor the network tests to rspec 3, merge in test for new vlan output
this blocks local for 10 minutes
Look for any number of spaces between the VxID and the value

Seems like some vservers have inconsistent formatting here and thus the virtualization is not accurately detected
Update CHANGELOG.md

fix my name and avoid bogus link in github
aix - fix regex to get java version
fix regex
aix - fix network plugin to use netstat instead of route.
aix - fix uptime timezone issue.
Merge pull request #417 from ClogenyTechnologies/kd/aixjavaplugin

Fix java version parsing regex
Ensure CPU total is an integer on FreeBSD

This matches the behavior on other platforms.
Merge pull request #421 from opscode/schisamo/freebsd-cpu-total-fix

Ensure CPU total is an integer on FreeBSD
Merge pull request #419 from ClogenyTechnologies/kd/aixuptimefix

[AIX-53] fix incorrect uptime
Don't hardcode XML return from API server on 404, just look for a 404
Merge pull request #413 from glensc/patch-1

Update CHANGELOG.md
Added unit tests for multiple spaces in Linux VServer spec

Check if there are multiple spaces before the value of `VxID` for Linux VServer hosts
Update platform.rb

Add support for Pidora in that if platform is "pidora" then platform_family should be "fedora"
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'
Update contribution info for https://github.com/opscode/ohai/pull/346.