Merge branch 'master' of github.com:dimagi/commcare-hq
use single vellum includes

Depends on https://github.com/dimagi/Vellum/pull/156
Merge pull request #2383 from mwhite/vellum-includes

use single vellum includes