updated version of bonnie_bundler to allow loading old and new value set XLS formats
merged on rebase
fixing nill popinter issue
adding a few more tests around derive_time_range
replace oid with code_list_id
fix cypress patients in demo
moved patient source data criteria fixing before demo measure deletion so that cypress patients are fixed in demo mode... otherwise the measures are deleted before the patients are fixed.
Merge pull request #31 from projecttacoma/fix_dc_id_lookup

Fix data criteria ID lookup.  This pull request is the combination of pull requests #22, #25, and #26.