Added socks alias to .zshrc, changed htop brew to mainline htop-osx
Merge branch 'master' of github.com:mlsimpson/dotfiles