Merge branch 'master' of https://github.com/ResearchComputing/serpentine-dolphine

Conflicts:
	sd_init.py