streamline options and their defaults, lots of tidying up.

git-svn-id: https://plugins.svn.wordpress.org/gwolle-gb/trunk@1029407 b8457f37-d9ea-0310-8a92-e5e31aec5664