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