linux specific settings
Merge branch 'master' into linux
fixed autocorrection in zsh
Merge remote-tracking branch 'origin/master' into linux
Merge branch 'master' into linux
updated vimrc to be the same as master
added nvm, updated gitconfig to include .idea, cleaned up zshrc, fixed shift-tab in zsh
added ruby plugins into zsh
Merge branch 'master' into linux
Merge branch 'master' into linux
combined linux and mac differences to work as one version, fixed some spacing issues, updated git aliases