server-side weechat config
Merge branch 'master' into servy
Merge remote-tracking branch 'origin/master' into servy
Merge remote-tracking branch 'origin/master' into servy
only disable bar and borders on the server branch
get rid of dirty repo
Merge remote-tracking branch 'origin/master' into servy
updates
tmx script test
this file should be in servy as well
same thing with these
sigh
Merge branch 'master' into servy

Conflicts:
	.vim/bundle/vim-easymotion.git
Merge remote-tracking branch 'origin/master' into servy

Conflicts:
	.vim/bundle/vim-easymotion.git
Merge branch 'master' into servy

Conflicts:
	.zshrc
Merge branch 'master' into servy
wtf
Merge remote-tracking branch 'origin/master' into servy
smaller font on irc screen
don't start pulseaudio in x11 on servy