Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes