Some changes to setup.py that hopefully make it work better cross-platform.
Made variable names more consistent.
Minor changes.