first step for making agenda and calendar accept options
Merge branch 'master' of github.com:geier/khal