vimrc + how does git handle hardlinks?
Add a few iTerm color schemes
add tmux.conf
add amethyst config
add zshrc
merge back to upstream
merge 'gwilliamac' to master