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