Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development