2.14 build preparation
Merge pull request #10 from dimagi/build-prep

2.14 build preparation