merge: sidebar fix

 * Only sort the sidebar if we're asked to

diff --cc init.h
Simple merge

diff --cc sidebar.c
Simple merge