New khal config
Add cherry-pick alias to git