Update for rethinkdb
Merge branch 'rethink'

Conflicts:
	monitor.py
Fix table name for hosts