Preparing to merge with develop
Merge branch 'integration_test' of https://github.com/cbmi/omop_harvest into integration_test