merged with the mac settings
added a diff --staged alias
removed git aliases from bash aliases
added cd up for 3 levels
github creds in gitconfig