Updated scripts
Merge branch 'master' of ssh://github.com/EmoryUniversity/SATO

Conflicts:
	scripts/loaddata.sh