Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Add defaults in gsm for settings.ini

Untested changes.
add defaults to gsmi for settings.ini
Merge branch 'feature/DefaultSettings' into develop
Merge remote-tracking branch 'upstream/develop' into develop
add documentation for including defaults in gsm and gsmi for settings.ini
Remove unnecessary end-of-line backslashes
fix test case broken by commit fb67c988b38292f580683b7dedef969e141fcbae
Merge branch 'develop' of https://github.com/ruchidesai/research-subject-mapper into develop

Conflicts:
	bin/generate_subject_map.py
	bin/generate_subject_map_input.py
	bin/gsm_lib.py
Reformat files

Cleaned up long strings, removed unused imports, and removed unused
variables.
correct spelling of xml_formatting_tranform to xml_formatting_transform
Improve makefile
Add new class `bin/utils/emailsender.py` with test cases
Use classes `EmailSender` and `EmailProps` for sending emails
Update example config files
Merge branch 'develop' of https://github.com/ruchidesai/research-subject-mapper into develop
Revert CHANGELOG edits from commit 6995982a

Undoing the spelling corrections to the CHANGELOG as it accurately
reflects the name of the file at the time the CHANGELOG was written. If
someone were to view an older version of the code, they should expect the
filename to be misspelled. We will make a note of the spelling
correction in the next release.
Update CHANGELOG, setup.py, README.md for v0.10.0
Merge branch 'release/0.10.0' into develop