Merge in header options and text formatting

This should solve these issues: https://github.com/CentralCollege/departments-wordpress-theme/issues/16 and https://github.com/CentralCollege/departments-wordpress-theme/issues/9