Unify option checks
Merge branch 'data_beta' of https://github.com/chipster/chipster.git into data_beta