Removed some extraneous function calls by creating 2 global variables
Re-organized function layout, added if statements to prevent things like cygwin() from being defined on a Mac platform, and cleaned up if, elif, else statements within each function to a simplified if, else
Removed if statements added in previous commit.  Created testing problems.
Small fixes for broken test
Updated