deleted:    config/Terminal/terminalrc
	modified:   config/geany/geany.conf
	deleted:    config/terminator/config
	modified:   irssi/config
	modified:   irssi/config~
Merge branch 'master' of https://github.com/jaysonrowe/dotfiles