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
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Merge branch 'master' of github.com:prawnsalad/KiwiIRC
Allow default client settings to be configurable

Also, a few misc code style changes in the settings applet
Do not save the default client settings
Merge pull request #280 from M2Ys4U/settings

Allow default client settings to be configurable
Bring parse regex inline with RFC for user part of the prefix

Fixes #283
Remove event bindings from commands.js

server/irc/connection.js's parse() function now calls the dispatch() method
on the connection's IrcCommands object rather than firing an event.

Can now also programatically add IRC command handlers and numerics to the
ones already supplied in server/irc/commands.js

Cleaned up whitespacing in several files
Respond to ERR_ERONEOUSNICKNAME
Fix nickname in use handling in network.js