2.18 version updates
Merge pull request #88 from dimagi/218_v_updates

2.18 version updates