channels fully working and serialised now
machines and bans now working with redis, though to be fair the bans arent really a database thing
fixed merge issues