add conditional columns
Merge pull request #1 from dimagi/conditional_columns

add conditional columns