config/Terminal/
	config/Thunar/
	config/geany/geany (ivy's conflicted copy 2013-05-13).conf
	config/xfce4/
	irssi/config (ivy's conflicted copy 2013-05-13)
	vimrc (ivy's conflicted copy 2013-05-13)
	new file:   config/Terminal/terminalrc
	modified:   irssi/config