updated
Merge branch 'master' of https://github.com/rehorn/livepool

Conflicts:
	lib/core.js
	lib/livepool/config.js