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

Conflicts:
	psiturk/psiturk_shell.py