Add Spine Style Option
s/spine_style/spine_options in setting registration

This setting ID was mismatched with the one set in the spine_canvas_style
control, causing a fatal error.
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
Fix diff intruders
Merge pull request #22 from washingtonstateuniversity/spine-styles

Spine styles
Merge branch 'master' into sectioning-headers

Merge changes from spine-styles feature branch