Refactor options code
Merge branch 'master' of https://github.com/Yoast/google-analytics-for-wordpress