Merge branch 'master' into watchdog

Conflicts:
	lib/queue.js
Update watchdog to work with monq 3.0
Merge branch 'watchdog' into blackboard

Conflicts:
	lib/queue.js
Fix merge conflict