Merge pull request #7 from dimagi/data_model_refactor

Data model refactor
Merge pull request #9 from dimagi/form_id_fix

uses instanceID instead of form ID to work arund weird commcare-export
Merge remote-tracking branch 'origin/master' into melissa