Merge pull request #163 from dimagi/vellum-languages-warning

Vellum languages warning
Merge pull request #164 from dimagi/cz

fix more type-switching bugs
Merge pull request #170 from mwhite/master

merge master of mwhite/Vellum
Merge branch 'master' into develop
Revert "Merge pull request #170 from mwhite/master"

This reverts commit 67f7ff57d049c5914de318d01fbb627d4b3378d5, reversing
changes made to 824b815b0844827bb72788e41ea0a7d037c37fea.
Merge pull request #171 from dimagi/revert-vellum

Revert "Merge pull request #170 from mwhite/master"
Revert "Merge pull request #171 from dimagi/revert-vellum"

This reverts commit cc912ed04a4b089f728efcb9354e02c2006c9d0b, reversing
changes made to 488728c1cca8006f16759119e0bde8a9d30726ad.
Merge branch 'develop' of github.com:dimagi/Vellum into develop