new file:   irssi/config~
	new file:   vimrc (ivy's conflicted copy 2013-05-13)
	deleted:    vimrc (ivy's conflicted copy 2013-05-13)