Make PEP8 compliant.
Merge branch 'dev' of github.com:NYUCCL/psiTurk into dev

# By Todd Gureckis
# Via Todd Gureckis
* 'dev' of github.com:NYUCCL/psiTurk:
  updated MANIFEST.in
  moving dashboard to a feature branch (follow up)

Conflicts:
	psiturk/psiturk_shell.py