Move to contrib/mc
Fix up code to work with rethinkdb generating the id rather than us
generating the id based on the path.