Edited conkyrc to include battery and update zshrc to not start tmux by default
because I now use i3!