Updated the query that pulls all patient's encounters whose observations are not voided
updated import_give_drugs script
Merge branch 'master' of github.com:BaobabHealthTrust/migration_imports into development
added missing concept to the migrator and import_hiv_staging_encounters script