Fixed typo.
Manually merged more changes from https://github.com/Hackerpilot/Dscanner.git
Turned off some unit tests in the allocator, because they are machine dependent.