Fixup many hardcoded unix paths, minor coding styles (spaces around concatenation)
Merge pull request #1436 from AlbinoGeek/1.7/develop

Fixup hardcoded *nix paths, some spaces around concatenation