Merge branch 'development', remote-tracking branch 'origin' into 1183_rawdisk
renamed VMwareInventory.java.  Added disk types VirtualDiskSeSparseBackingInfo,VirtualDiskSparseVer2BackingInfo,VirtualDiskRawDiskVer2BackingInfo
eworked exception handling so diagnostics never throws a 500 error.  Reworked 3rd party jar directories to include source/licensing.  Added low-level virtual machine informaiton to diagnostics
Merge branch 'master' into 1183_rawdisk
Fixed all the routing issues caused by merging master.  Reference https://github.com/padrino/padrino-framework/issues/1055
Added rspec to test inodes routes
removed unix_proxy_environment file.  Legacy from ruby 1.8.7 usage
Moved 6fusion java class to src and generate jar file.  Prep work for adding junit.
Merge pull request #16 from 6fusion/1183_rawdisk

1183 rawdisk
Replacing VmwareAdaptor.java with JRuby and implemented Start/Stop/Restart for VMs
Ported the gather VM's and devices code over to jruby. Expanded gathering hosts.
Gather readings with jRuby, quick attempt at tying it into the web frontend.
Added disk usage metric, fixed disk and nic stat parsing.
Removed unneeded Java libs, added diagnostics gathering and got the controllers to play nicely with the new Jruby.
report a release_version for the adaptor based on the REVISION and VERSION files or the current git branch and commit.  see issue:1301
Corrected some payload formatting issues.
Commented out some orchestration functionality.
Added shared disk type for raw disk mappings and added a quick fix for thin provisioning
Java to Ruby string fix, added default for thin provisioning.
Merge pull request #17 from 6fusion/1301_version_numbers

report a release_version for the adaptor based on the REVISION and VERSI...