more lib rework
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/test-mcrcon.js