combined linux and mac differences to work as one version, fixed some spacing issues, updated git aliases