Merge remote-tracking branch 'ccutrer/dev/per_object_pool_modes'

diff --cc doc/config.txt
Simple merge

diff --cc include/bouncer.h
Simple merge

diff --cc src/admin.c
Simple merge

diff --cc src/loader.c
Simple merge

diff --cc src/main.c
Simple merge