vicious
added tmux screenshot, edited tmux.conf to use rxvt terminal, and changed default screenshot to show new clock
Merge branch 'master' into solarized