consolidating linux and osx into single branch.

not enough difference to justify two branches.
fix zOS assignment
removed aliases from gitconfig eliminating conflicts
configuring for git diff and merge tools on both os
added preliminary linux tools for gitconfig - must verify on linux, fixed include in gitconfig
fixing os install function
changed update_links to address both OSs