Changes toweechat
Merge branch 'master' of https://github.com/sjohnsen/config

Conflicts:
	weechat/weechat.conf