Merged linux and OSX specific entries.
Numerous small changes to functions and aliases.  Changes from OSX rolled in as well.