Merge branch 'master' of https://github.com/ctsit/redi into develop
Improve `bin/utils/redcap_records.py` - now works with json/xml
Add `choices` to indicate valid `-t` option for running redcap_records.py
Usage now displays: [-t {json,csv,xml}]
When there is an error we get:
   redcap_records.py: error: argument -t/--type: invalid choice: 'csv2' (choose from 'json', 'csv', 'xml')
Merge branch 'develop' of https://github.com/ctsit/redi into develop

Conflicts:
	bin/utils/redcap_records.py
Merge branch 'develop' of https://github.com/ctsit/redi into develop
Add clinical-commit-to-loinc.xml helper scripts

- generate_cctl.py generates the XML from a CSV
- cctl_to_csv.py writes out a CSV from an XML

Careful, the CSV from cctl_to_csv.py cannot be read in by
generate_cctl.py without modification.
Add unit test `TestRediEmail.py` to verify changed code for Issue #47
Closes issue #47 - hardcoded `smtp.ufl.edu`
Set the email subject properly
Add support for 3-col CSV to generate_cctl.py
Avoid `referenced before assignment` error
when smtp server is not available
Merge pull request #56 from ufl-taeber/master

Add clinical-component-to-loinc.xml helper scripts
Merge branch 'develop' of https://github.com/ctsit/redi into develop
Merge pull request #57 from indera/fix-47-smtp-hardcoded

Fix 47 smtp hardcoded
Read `redcap_uri` and `token` from settings.ini
This commit represents part 1 for issue #58
Define `REDCAP_PROJECT_ID` value in `Makefile.ini` to be used by the `rc_clean` task
This commit represents part 2 for issue #58
Define `REDCAP_PROJECT_FORMS` to be used by `rc_get` task
This commit represents part 3 for issue #58
Merge pull request #51 from indera/develop

Per Taeber added `choices` while parsing the `-t` argument
Remove references to `demographics`
This commit represents part r for issue #58
Remove redundant json file: `vagrant-data/demographic_test_data.json`
(per Philip)