Prevent accidental publishing to npm repository
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
SECURITY FIX: Kiwi is vulnerable to XSS attack due to unsanitised topic text. Issue #103

Changes the topic bar from an <input> to a <div contenteditable=true/>.

Also now uses Underscore's escape() method rather than .html().text() jQuery hack.
resolve merge conflict
Merge branch 'master' of github.com:prawnsalad/KiwiIRC

Conflicts:
	package.json
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Nicer-looking nick area (see PR #187 for background)
Fixing previous commit: only works in the Relaxed theme
Cleanup: remove newline added in previous commits

sorry for the noise!
Don't use for..in for n array

Every time you use for..in for an Array, Justin Beiber kills a kitten.
Merge pull request #256 from ThiefMaster/patch-1

Don't use for..in for an array
Merge branch 'master' into development
Client: #toolbar change to .toolbar
#topic & #tabs -> .topic & .tabs
#status_message now .status_message