Resolve settings mismatch, move style options
Merge branch 'spine-styles' of https://github.com/washingtonstateuniversity/WSUWP-spine-parent-theme into spine-styles

Conflicts:
	admin/customizer.php