Merge pull request #7 from CamdenSegal/master

Theme Options change to Site Options and clean up.