Fixed some health issues
Merge branch 'dev' of https://github.com/NYUCCL/psiTurk into dev

Conflicts:
	psiturk/psiturk_shell.py
Revert "Merge branch 'dev' of https://github.com/NYUCCL/psiTurk into dev"

This reverts commit bd0ec9358ea2a62693128e50f8014f1a44a45a85, reversing
changes made to 1035797744d4a90189fdfafbe6cb4892dd08856f.
More health fixes