Add multi-valued option types
Merge branch 'master' of https://github.com/kilahm/HackClio