update to use jsPsych v3.1

includes some changes to the example code to make use of newer jsPsych
features
 _
Merge remote-tracking branch 'original/master' into gh-pages

Conflicts:
	index.html
cleanup