Major updates to options page logic

Signed-off-by: Elliot Condon <e@elliotcondon.com>
Merge branch 'master' of https://github.com/AdvancedCustomFields/acf5-beta