Clean useless preprocessor code (refs #55)
Add a new option to make.sh to build OSX universal binaries (-u)