Updated tmux and ZSH paths. New binary files.
Battery output for OSX
Complete merger.