Added global .gitignore + 'patience' diff algo
Added package weechat
Merge branch 'master' into cobalt

Conflicts:
	git/.gitconfig
Updated weechat color scheme
Merge branch 'master' into cobalt