Updating gitconfig to point to brew's Vim, not system's
Adding Mac OS X brew, zsh, and vim update-all alias
Fixing tmux.conf for Mac OS X
Updating freshrc to use tmux and GNU colors plugins
Using if-shell test for Macs
Merge branch 'ubuntu' into macosx

Merging everything together to handle conditionals in-script
Combinging aliases file
Sourcing powerline for tmux for Linux
Updating freshrc, gitconfig, and zshrc