Changes to only update modified subjects
Add dif as diffusion type
Fix session ID
Add job_email as launcher option that's passed to task and then to
cluster
Add setting of email options (bae) for PBS
Manually add changes from master
Manual merge
Merge branch 'master' into lastmod

Conflicts:
	cci/XnatUtils.py