Large update; switch to type in if statements

Less messing with PATHs between Linux/OS X which allows more aliases to be global.  Thus simplifying the file in theory.