fixed problem where session wouldn't terminate at night
delete stimulus file after a trial
Merge pull request #19 from MarvinT/shape

sleep in shape.py
converted polling loops to utils.wait(dur)
set params in shaper
adding sound playback to test routine
converted polling loops to utils.wait(dur)
Merge branch 'dev' of https://github.com/gentnerlab/pyoperant into dev

Conflicts:
	pyoperant/components.py
Merge remote-tracking branch 'origin/dev' into vogel

Conflicts:
	pyoperant/tricks/evidence_accum.py
remove reference to stim_string
Merge branch 'vogel' into shape
merged