bugfix
Merge branch 'master' of https://github.com/straps/node-dbmon

Conflicts:
	test/gui/postgresql-socketio/pgconn.js