Merge 3.3 outstanding pull requests up to 3.4/develop

These were the outstanding pull requests (mostly coding standards and small tweaks, the only notable change being dropping the collapsing/expanding sidebar) that I merged to 3.3 and now need merging up to 3.4.