Merge branch 'release/0.9.0'
Remove hard-coded smtp.ufl.edu
Release 0.10.0 changes
Merge pull request #16 from mdk142/master

Release 0.10.0 changes
Merge pull request #15 from ufl-taeber/master

Remove hard-coded smtp.ufl.edu
Merge branch 'develop' of github.com:ctsit/redi into develop

Conflicts:
	bin/utils/redcap_records.py fixed
Update CHANGELOG, setup.py, Makefile for v0.10
Change line endings to UNIX format
Update prereqs in setup.py
Merge branch 'release/0.10.0' into develop
Merge branch 'release/0.10.0'

Conflicts:
	CHANGELOG
	bin/redi.py
	setup.py
Merge branch 'master' into develop