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
Merge branch 'develop' of https://github.com/ctsit/redi into develop
Merge pull request #51 from indera/develop

Per Taeber added `choices` while parsing the `-t` argument