Make virtualization detection on OS X less buggy/horrible
Merge pull request #6371 from KB1JWQ/corey-fixosxvirt

Make virtualization detection on OS X less buggy/horrible
Memory detection actually works on OS X now
Merge pull request #6372 from KB1JWQ/corey-fixmem

Memory detection actually works on OS X now
Merge branch 'develop' into with-pylint-pragmas