Re-remove settings block, and move new code to that block
reintroduce sidebars
Merge pull request #301 from Jasig/fix_merge_regression_issues

Fix merge regression issues

Looks great -- thanks for the quick action!